[Swift-commit] r4021 - in SwiftApps/SwiftR/Swift: . R

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-01-20 20:36:10 -0600 (Thu, 20 Jan 2011)
New Revision: 4021

Modified:
   SwiftApps/SwiftR/Swift/DESCRIPTION
   SwiftApps/SwiftR/Swift/R/Fifo.R
   SwiftApps/SwiftR/Swift/R/Swift.R
   SwiftApps/SwiftR/Swift/R/Workers.R
Log:
Fixed shell quoting bug that prevented specification of multiple hosts.
Updated version number


Modified: SwiftApps/SwiftR/Swift/DESCRIPTION
===================================================================
--- SwiftApps/SwiftR/Swift/DESCRIPTION	2011-01-21 00:31:06 UTC (rev 4020)
+++ SwiftApps/SwiftR/Swift/DESCRIPTION	2011-01-21 02:36:10 UTC (rev 4021)
@@ -1,7 +1,7 @@
 Package: Swift
 Type: Package
 Title: R interface to Swift parallel scripting languaage
-Version: 0.1
+Version: 0.2
 Date: 2010-02-25
 Author: Michael Wilde
 Maintainer: Michael Wilde <wilde at mcs.anl.gov>

Modified: SwiftApps/SwiftR/Swift/R/Fifo.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Fifo.R	2011-01-21 00:31:06 UTC (rev 4020)
+++ SwiftApps/SwiftR/Swift/R/Fifo.R	2011-01-21 02:36:10 UTC (rev 4021)
@@ -33,7 +33,7 @@
         cmdString <- paste(bin, fifopath, "-t", timeout)
     }
     cmdString <- paste(cmdString, "-m", 
-            paste("'", message, "'", sep=""), "&>/dev/null")
+            shQuote(message), "&>/dev/null")
 
     retval <- system(cmdString, wait=TRUE)
 

Modified: SwiftApps/SwiftR/Swift/R/Swift.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Swift.R	2011-01-21 00:31:06 UTC (rev 4020)
+++ SwiftApps/SwiftR/Swift/R/Swift.R	2011-01-21 02:36:10 UTC (rev 4021)
@@ -83,6 +83,7 @@
 #  reqdir <- system(paste("mktemp -d ", basedir, "/SwiftR.run.XXXX",sep=""),intern=TRUE)
   reqdir = sprintf("%s/R%.7d",requestdirbase,requestid)
   dir.create(reqdir,showWarnings=FALSE)
+  #dir.create(reqdir,showWarnings=TRUE)
   if (! quiet) {
       cat("Swift request is in",reqdir,"\n")
   }  

Modified: SwiftApps/SwiftR/Swift/R/Workers.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Workers.R	2011-01-21 00:31:06 UTC (rev 4020)
+++ SwiftApps/SwiftR/Swift/R/Workers.R	2011-01-21 02:36:10 UTC (rev 4021)
@@ -38,40 +38,40 @@
     cmdString <- file.path(.find.package("Swift"), "exec/start-swift-daemon")
 
     if(! is.null(cores) )  {
-        cmdString <- paste(cmdString, "-c", cores)
+        cmdString <- paste(cmdString, "-c", shQuote(cores))
     }
     
     if(is.null(server))
         server <- getOption("swift.server")
     if(! is.null(server) )  {
-        cmdString <- paste(cmdString, "-s", server) 
+        cmdString <- paste(cmdString, "-s", shQuote(server)) 
     }
     if(! is.null(hosts) )  {
-        cmdString <- paste(cmdString, "-h", hosts) 
+        cmdString <- paste(cmdString, "-h", shQuote(hosts) )
     }
     if(! is.null(parEnv) )  {
-        cmdString <- paste(cmdString, "-e", parEnv) 
+        cmdString <- paste(cmdString, "-e", shQuote(parEnv)) 
     }
     if(! is.null(workmode) )  {
-        cmdString <- paste(cmdString, "-m", workmode) 
+        cmdString <- paste(cmdString, "-m", shQuote(workmode)) 
     }
     if(! is.null(nodes) )  {
-        cmdString <- paste(cmdString, "-n", nodes) 
+        cmdString <- paste(cmdString, "-n", shQuote(nodes)) 
     }
     if(! is.null(throttle) )  {
-        cmdString <- paste(cmdString, "-p", throttle) 
+        cmdString <- paste(cmdString, "-p", shQuote(throttle)) 
     }
     if(! is.null(queue) )  {
-        cmdString <- paste(cmdString, "-q", queue) 
+        cmdString <- paste(cmdString, "-q", shQuote(queue)) 
     }
     if(! is.null(rcmd) )  {
-        cmdString <- paste(cmdString, "-r", rcmd) 
+        cmdString <- paste(cmdString, "-r", shQuote(rcmd)) 
     }
     if(! is.null(time) )  {
-        cmdString <- paste(cmdString, "-t", time) 
+        cmdString <- paste(cmdString, "-t", shQuote(time)) 
     }
     if(! is.null(workerLogging) )  {
-        cmdString <- paste(cmdString, "-w", workerLogging) 
+        cmdString <- paste(cmdString, "-w", shQuote(workerLogging)) 
     }