Overview
| Comment: | Updated configf include handling to not fail when there are include files that don't exist |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65 | v1.6512 | fb7e6638f82b75f13d06d9695667992eba806073 |
| Files: | files | file ages | folders |
| SHA1: |
10a8cb99bfe2b89a84510196977d3a6c |
| User & Date: | jmoon18 on 2018-06-19 18:52:40 |
| Other Links: | branch diff | manifest | tags |
Context
|
2018-06-19
| ||
| 19:22 | fix to run post hook script only once check-in: 2f6d498c71 user: pjhatwal tags: v1.65 | |
| 18:52 | Updated configf include handling to not fail when there are include files that don't exist check-in: 10a8cb99bf user: jmoon18 tags: v1.65, v1.6512, fb7e6638f82b75f13d06d9695667992eba806073 | |
|
2018-06-08
| ||
| 15:45 | modified links in html to relative paths check-in: f4e6b4ecb2 user: pjhatwal tags: v1.65 | |
Changes
Modified configf.scm from [2417270485] to [77100eae92].
| ︙ | ︙ | |||
324 325 326 327 328 329 330 |
(begin
(hash-table-set! settings setting val)
(loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
curr-section-name #f #f)))
(configf:include-rx ( x include-file )
(let* ((curr-conf-dir (pathname-directory path))
| | | | 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 |
(begin
(hash-table-set! settings setting val)
(loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
curr-section-name #f #f)))
(configf:include-rx ( x include-file )
(let* ((curr-conf-dir (pathname-directory path))
(full-conf (if (and (absolute-pathname? include-file) (file-exists? include-file))
include-file
(common:nice-path
(conc (if curr-conf-dir
curr-conf-dir
".")
"/" include-file)))))
(let ((all-matches (sort (handle-exceptions exn (list) (glob full-conf)) string<=?)))
(if (null? all-matches)
(begin
(debug:print '(2 9) #f "INFO: include file(s) matching " include-file " not found (called from " path ")")
(debug:print 2 *default-log-port* " " full-conf))
(for-each
(lambda (fpath)
;; (push-directory conf-dir)
|
| ︙ | ︙ |