Index: common.scm ================================================================== --- common.scm +++ common.scm @@ -59,12 +59,12 @@ #f) (thunk))) (define getenv get-environment-variable) (define (safe-setenv key val) - (if (substring-index ":" key) ;; variables containing : are for internal use and cannot be environment variables. - (debug:print-error 4 *default-log-port* "skip setting internal use only variables containing \":\"") + (if (or (substring-index "!" key) (substring-index ":" key)) ;; variables containing : are for internal use and cannot be environment variables. + (debug:print-error 4 *default-log-port* "skip setting internal use only variables containing \":\" or starting with \"!\"") (if (and (string? val) (string? key)) (handle-exceptions exn (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val) Index: launch.scm ================================================================== --- launch.scm +++ launch.scm @@ -654,11 +654,11 @@ (lambda (varval) (let ((var (car varval)) (val (cadr varval))) (if (and (string? var)(string? val)) (begin - (setenv var (config:eval-string-in-environment val))) ;; val) + (safe-setenv var (config:eval-string-in-environment val))) ;; val) (debug:print-error 0 *default-log-port* "bad variable spec, " var "=" val)))) (configf:get-section rconfig section))) (list "default" target))) ;;(bb-check-path msg: "launch:execute post block 1") Index: mtut.scm ================================================================== --- mtut.scm +++ mtut.scm @@ -788,11 +788,11 @@ (all-areas (map car (configf:get-section mtconf "areas"))) (contours (configf:get-section mtconf "contours")) (torun (make-hash-table)) ;; target => ( ... info ... ) (rgentargs (hash-table-keys rgconf))) ;; these are the targets registered for automatically triggering - (print "rgentargs: " rgentargs) + ;;(print "rgentargs: " rgentargs) (for-each (lambda (runkey) (let* ((keydats (configf:get-section rgconf runkey))) (for-each @@ -948,12 +948,12 @@ ;; syntax is a little different here. It is a list of commands to run, "scriptname = extra_parameters;scriptname = ..." ;; where scriptname may be repeated multiple times. The script must return unix-epoch of last change, new-target-name and new-run-name ;; the script is called like this: scriptname contour runkey std-runname action extra_param1 extra_param2 ... (for-each (lambda (cmd) - (print "cmd: " cmd) - (print "Areas: " all-areas) + ;;(print "cmd: " cmd) + ;;(print "Areas: " all-areas) (for-each (lambda (area) (if (area-allowed? area "area-needs-to-be-run" runkey contour #f) ;; is this area to be handled (from areas=a,b,c OR using areafn=abcfn and *area-checks* ...) (let* ((script (car cmd)) @@ -1027,11 +1027,11 @@ (aval (or (configf:lookup mtconf "areas" area) "")) (aval-alist (common:val->alist aval)) (targets (map-targets mtconf aval-alist runkey area contour))) (pp targets) - (for-each (lambda (target) (create-run-pkt mtconf action area runkey target runname mode-patt + (for-each (lambda (target) (create-run-pkt mtconf action area runkey target new-runname mode-patt tag-expr pktsdir reason contour sched dbdest append runtrans)) targets) ;;(create-run-pkt mtconf action area runkey target runname ;; pktsdir reason contour dbdest append @@ -1186,12 +1186,12 @@ (targets ;;(or (alist-ref 'target runkeydat) (map-targets mtconf aval-alist runkey area contour))) ;; override with target if forced ;;(targets (or (alist-ref 'target runkeydat) ;; (map-targets mtconf aval-alist runkey area contour)))) ;; override with target if forced ;; NEED TO EXPAND RUNKEY => ALL TARGETS MAPPED AND THEN FOREACH .... - (print "Targets: " targets) - (print "alist: " (alist-ref 'target runkeydat)) + ;;(print "Targets: " targets) + ;;(print "alist: " (alist-ref 'target runkeydat)) (for-each (lambda (target) (print "Creating pkt for runkey=" runkey " target=" target " contour=" contour " area=" area " action=" action " tag-expr=" tag-expr " mode-patt=" mode-patt) (if (case (or (and action (string->symbol action)) 'noaction) ;; ensure we have the needed data to run this action ((noaction) #f)