Changeset 4135

Timestamp:

Jan 20, 2014, 11:18:06 AM (11 years ago)

Author:

mmc

Message:

Oops! Fixed the handling of run files. If the task -resultdir is set to
@default and the session directory doesn't exist, then the run file is
stored in the current directory. This is the behavior that Rappture has
had all along. It got messed up when -resultdir was introduced at the
task level.

File:

• trunk/lang/tcl/scripts/task.tcl (modified) (2 diffs)

trunk/lang/tcl/scripts/task.tcl

@@ -372 +372 @@
                 if {[info exists _resources(-resultdir)]} {
                     set rdir $_resources(-resultdir)
+                } else {
+                    set rdir "."
                 }
             } elseif {$resultdir ne ""} {
@@ -379 +381 @@
             if {$status == 0 && $rdir ne ""} {
                 catch {
-                    if {![file exists $_resources(-resultdir)]} {
-                        _mkdir $_resources(-resultdir)
+                    file delete -force -- $file
+                    if {![file exists $rdir]} {
+                        _mkdir $rdir
                     }
                     set tail [file tail $file]
-                    set fid [open [file join $_resources(-resultdir) $tail] w]
+                    set fid [open [file join $rdir $tail] w]
                     puts $fid "<?xml version=\"1.0\"?>"
                     puts $fid [$result xml]
                     close $fid
-                    file delete -force -- $file
                 }
             } else {