Overview
| Comment: | turned off env-to-use in scheme eval, removed erroneous setting of toppath |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v2.0001 |
| Files: | files | file ages | folders |
| SHA1: |
aad18f28aed66c018839c9382499ddf1 |
| User & Date: | mmgraham on 2022-02-11 15:20:59 |
| Other Links: | branch diff | manifest | tags |
Context
|
2022-02-12
| ||
| 20:16 | Protect all transactions with mutex. check-in: 3454f1583b user: matt tags: v2.0001 | |
|
2022-02-11
| ||
| 15:20 | turned off env-to-use in scheme eval, removed erroneous setting of toppath check-in: aad18f28ae user: mmgraham tags: v2.0001 | |
|
2022-02-10
| ||
| 12:19 | changed the config hash key for toppath from empty string to toppath check-in: 366b1b75fd user: mmgraham tags: v2.0001 | |
Changes
Modified configfmod.scm from [b96bbf2b72] to [0a88930474].
| ︙ | ︙ | |||
1013 1014 1015 1016 1017 1018 1019 |
(print var " " val)))
section-dat))))) ;; (print "section-dat: " section-dat))
(hash-table->alist data)))
(define (runconfig:read fname target environ-patt)
(let ((ht (make-hash-table)))
(if target (hash-table-set! ht target '()))
| < | 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 |
(print var " " val)))
section-dat))))) ;; (print "section-dat: " section-dat))
(hash-table->alist data)))
(define (runconfig:read fname target environ-patt)
(let ((ht (make-hash-table)))
(if target (hash-table-set! ht target '()))
(configf:read-config fname ht #t environ-patt: environ-patt sections: (if target (list "toppath" "default" target) #f))))
;;======================================================================
;; Config file handling
;;======================================================================
;; convert to param?
|
| ︙ | ︙ | |||
1073 1074 1075 1076 1077 1078 1079 |
(handle-exceptions
exn
(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
| > | | > > | > | > | 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 |
(handle-exceptions
exn
(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) 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))
(else ;; (#f errres)
(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)))
(define (configf:process-line l ht allow-system env-to-use #!key (linenum #f))
(let loop ((res l))
|
| ︙ | ︙ |