tcl: fixes following merge/reorg

diff --git a/sg-run-job b/sg-run-job
index 5cc3e22897ddce5a69c7a03cd087b005ccf41a23..7bdc35987d68f953545ee3c7ab4e69e951101112 100755 (executable)
--- a/sg-run-job
+++ b/sg-run-job
@@ -146,7 +146,7 @@ proc spawn-ts {iffail testid ts args} {
     set xprefix {}
     if {[info exists env(OSSTEST_SIMULATE)]} { set xprefix echo }
 
-    set log [jobdb::step-log-filename $flight $jobinfo(job) $stepno]
+    set log [jobdb::step-log-filename $flight $jobinfo(job) $stepno $ts]
     set redirects {< /dev/null}
     if {[string length $log]} {
         lappend redirects 2> $log

diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl
index 6e6b6546e88476918f3088644f0b08ef44e7a299..997aca98f85a6da28a703add5b3dd0e7232ce479 100644 (file)
--- a/tcl/JobDB-Executive.tcl
+++ b/tcl/JobDB-Executive.tcl
@@ -267,7 +267,7 @@ proc become-task {comment} {
     }
 }
 
-proc step-log-filename {flight job stepno} {
+proc step-log-filename {flight job stepno ts} {
     global c
     set logdir $c(Logs)/$flight/$job
     file mkdir $c(Logs)/$flight

diff --git a/tcl/JobDB-Standalone.tcl b/tcl/JobDB-Standalone.tcl
index 83032958591ca1165b9d9231b1e10af62fa7636c..a2b8dd9c8856da5baa3005f7e9382d3fd0beeac1 100644 (file)
--- a/tcl/JobDB-Standalone.tcl
+++ b/tcl/JobDB-Standalone.tcl
@@ -75,7 +75,7 @@ proc step-set-status {flight job stepno st} {
 
 proc become-task {argv} { }
 
-proc step-log-filename {flight job stepno} {
+proc step-log-filename {flight job stepno ts} {
     return {}
 }