Changeset 6501 for branches/1.6

Timestamp:

Aug 26, 2016, 7:24:25 AM (8 years ago)

Author:

gah

Message:

fix to respect <cache> tag in tool.xml

File:

• branches/1.6/lang/tcl/scripts/task.tcl (modified) (1 diff)

branches/1.6/lang/tcl/scripts/task.tcl

@@ -464 +464 @@
     if { ![info exists _resources(-cachehosts)] ||
          $_resources(-cachehosts) == "" } {
-puts stderr cachehosts=[info exists _resources(-cachehosts)]
+        puts stderr cachehosts=[info exists _resources(-cachehosts)]
         return 0
     }
-if 0 {
-    set state [$_xmlobj get "tool.cache"]
-puts stderr "cache tag is \"$state\""
-    if { $state == "" } {
-        return 0
-    }
-} else {
-    set state 1 
-}
-    if { ![string is boolean $state] } {
-        return 0
+    global env
+    if { [info exists env(RAPPTURE_CACHE_OVERRIDE)] } {
+        set state $env(RAPPTURE_CACHE_OVERRIDE)
+    } else {
+        set state [$_xmlobj get "tool.cache"]
+    }
+    puts stderr "cache tag is \"$state\""
+    if { $state == ""  || ![string is boolean $state] } {
+        return 1;                       # Default is to allow caching.
     }
     return $state