Index: configfmod.scm ================================================================== --- configfmod.scm +++ configfmod.scm @@ -1015,11 +1015,10 @@ (hash-table->alist data))) (define (runconfig:read fname target environ-patt) (let ((ht (make-hash-table))) (if target (hash-table-set! ht target '())) - (configf:set-section-var ht "toppath" "toppath" (getenv "PWD")) (configf:read-config fname ht #t environ-patt: environ-patt sections: (if target (list "toppath" "default" target) #f)))) ;;====================================================================== ;; Config file handling ;;====================================================================== @@ -1075,17 +1074,22 @@ (begin (debug:print 0 *default-log-port* "WARNING: failed to process config input \"" l "\", eval-needed, newres="newres", exn="(condition->list exn)) (debug:print 0 *default-log-port* " message1: " ((condition-property-accessor 'exn 'message) exn)) (set! result (conc "#{( " cmdtype ") " cmd "}, full expansion: " newres))) (if env-to-use - ((eval (read) env-to-use) ht) + ;; ((eval (read) env-to-use) ht) disable until we fix this. 2/10/22 Martin + ((eval (read)) ht) ((eval (read)) ht) )))))) - (set! result (conc "#{(" cmdtype ") " cmd "}")))); ) - (('noeval-needed newres)(set! result newres)) + (set! result (conc "#{(" cmdtype ") " cmd "}")) + ) + ) + (('noeval-needed newres) + (set! result newres)) (else ;; (#f errres) - (debug:print 0 *default-log-port* "WARNING: failed to process config input \""l"\", fullcmd="fullcmd"."))) + (debug:print 0 *default-log-port* "WARNING: failed to process config input \""l"\", fullcmd="fullcmd"."))) + ;; we process as a result (let ((delta (- (current-seconds) start-time))) (debug:print-info (if (> delta 2) 0 9) *default-log-port* "for line \"" l "\"\n command: " cmd " took " delta " seconds to run with output:\n " result)) (conc prestr result poststr)))