[Swift-commit] r4314 - SwiftApps/SwiftR/Swift/R

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-04-08 13:51:13 -0500 (Fri, 08 Apr 2011)
New Revision: 4314

Modified:
   SwiftApps/SwiftR/Swift/R/Apply.R
Log:
Fixed bug when quiet not provided.


Modified: SwiftApps/SwiftR/Swift/R/Apply.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Apply.R	2011-04-08 18:00:29 UTC (rev 4313)
+++ SwiftApps/SwiftR/Swift/R/Apply.R	2011-04-08 18:51:13 UTC (rev 4314)
@@ -21,6 +21,9 @@
 {
   # Set Swift default options if not passed as keywords or pre-set by user
   if(is.null(server)) server <- getOption("swift.server")
+  
+  if(is.null(quiet)) quiet <- getOption("swift.quiet")
+  if(is.null(quiet)) quiet <- FALSE
 
   if(is.null(callsperbatch)) callsperbatch <- getOption("swift.callsperbatch")
   if(is.null(callsperbatch)) 
@@ -43,9 +46,6 @@
   if(is.null(keepwork)) keepwork <- FALSE;
 
   if(is.null(tmpdir)) tmpdir <- chooseTmpDir()
-
-  if(is.null(quiet)) quiet <- getOption("swift.quiet")
-  if(is.null(quiet)) quiet <- FALSE
   
   if(is.null(printTiming)) printTiming <- getOption("swift.printtiming")
   if(is.null(printTiming)) printTiming <- FALSE