Changeset 6543


Ignore:
Timestamp:
Sep 13, 2016 12:39:57 PM (6 years ago)
Author:
ldelgass
Message:

merge r6501 from 1.6 branch (respect cache tag)

Location:
branches/1.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.7

  • branches/1.7/lang/tcl/scripts/task.tcl

    r6472 r6543  
    464464    if { ![info exists _resources(-cachehosts)] ||
    465465         $_resources(-cachehosts) == "" } {
    466 puts stderr cachehosts=[info exists _resources(-cachehosts)]
     466        puts stderr cachehosts=[info exists _resources(-cachehosts)]
    467467        return 0
    468468    }
    469 if 0 {
    470     set state [$_xmlobj get "tool.cache"]
    471 puts stderr "cache tag is \"$state\""
    472     if { $state == "" } {
    473         return 0
    474     }
    475 } else {
    476     set state 1
    477 }
    478     if { ![string is boolean $state] } {
    479         return 0
     469    global env
     470    if { [info exists env(RAPPTURE_CACHE_OVERRIDE)] } {
     471        set state $env(RAPPTURE_CACHE_OVERRIDE)
     472    } else {
     473        set state [$_xmlobj get "tool.cache"]
     474    }
     475    puts stderr "cache tag is \"$state\""
     476    if { $state == ""  || ![string is boolean $state] } {
     477        return 1;                       # Default is to allow caching.
    480478    }
    481479    return $state
Note: See TracChangeset for help on using the changeset viewer.