Merge branch 'master' of github.com:swift-lang/swift-t

Author: j-woz

dev/conda/build-generic.sh

@@ -115,8 +115,13 @@ then
   export R_HOME=$( R RHOME )
 
   log "Installing RInside into $R_HOME ..."
-  Rscript $DEV_CONDA/install-RInside.R 2>&1 | \
-    tee $RECIPE_DIR/install-RInside.log
+  (
+    # Allow pipe errors here:
+    #       we put token "Swift-RInside-SUCCESS" in the log:
+    set +o pipefail
+    Rscript $DEV_CONDA/install-RInside.R 2>&1 | \
+      tee $RECIPE_DIR/install-RInside.log
+  )
   if ! grep -q "Swift-RInside-SUCCESS" $RECIPE_DIR/install-RInside.log
   then
     abort "Installing RInside failed."

dev/conda/install-RInside.R

@@ -3,10 +3,14 @@
 # Installs RInside for the Anaconda package
 # Called by build-generic.sh
 
+cat("install-RInside.R: starting...\n")
+
 install.packages("RInside",
-                 repos="http://cran.us.r-project.org")
+                 # repos="http://cran.us.r-project.org",
+                 repos="https://cran.case.edu",
+                 verbose=TRUE)
 if (! library("RInside",
     character.only=TRUE, logical.return=TRUE)) {
     quit(status=1)
 }
-print("Swift-RInside-SUCCESS")
+cat("install-RInside.R: Swift-RInside-SUCCESS\n")

turbine/code/lib/files.tcl

@@ -530,13 +530,13 @@ namespace eval turbine {
     }
 
     proc do_glob { result inputs } {
-        rule $inputs "glob_body $result $inputs" \
+        rule $inputs "do_glob_body $result $inputs" \
              name "glob-$result" type $::turbine::WORK
     }
     proc do_glob_body { result s } {
         set s_value [ retrieve_decr_string $s ]
         set r_value [ ::glob -nocomplain $s_value ]
-        log "glob: $s_value"
+        log "do_glob: $s_value"
 
         set i 0
         foreach v $r_value {