Overview
| Comment: | Merging (much needed but not yet working) empty section preservation branch into v1.65 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65 |
| Files: | files | file ages | folders |
| SHA1: |
21dd573ab7ab0a63d35c0df07df08dae |
| User & Date: | matt on 2017-04-25 06:07:37 |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-04-25
| ||
| 14:20 | Keeping up with changes ... check-in: 4485968e23 user: mrwellan tags: v1.65 | |
| 06:07 | Merging (much needed but not yet working) empty section preservation branch into v1.65 check-in: 21dd573ab7 user: matt tags: v1.65 | |
| 05:19 | Merged nice dashboard cleanup changes into v1.65 check-in: 66eb2de9fa user: matt tags: v1.65 | |
| 00:12 | configf - keep reference to empty sections. NOTE: This breaks several tests but is still correct behavior check-in: 3129220de0 user: matt tags: v1.64, config-section-fix | |
Changes
Modified configf.scm from [1be6cc85e3] to [c11b8481f7].
| ︙ | ︙ | |||
318 319 320 321 322 323 324 325 326 327 328 329 330 331 |
(proc (cdr dat)))
(if (string-match patt curr-section-name)
(proc curr-section-name section-name res path))))
post-section-procs)
;; after gathering the vars for a section and if apply-wildcards is true and if there is a wildcard in the section name process wildcards
;; NOTE: we are processing the curr-section-name, NOT section-name.
(process-wildcards res curr-section-name)
(loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
;; if we have the sections list then force all settings into "" and delete it later?
;; (if (or (not sections)
;; (member section-name sections))
;; section-name "") ;; stick everything into "". NOPE: We need new strategy. Put stuff in correct sections and then delete all sections later.
section-name
#f #f)))
| > | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 |
(proc (cdr dat)))
(if (string-match patt curr-section-name)
(proc curr-section-name section-name res path))))
post-section-procs)
;; after gathering the vars for a section and if apply-wildcards is true and if there is a wildcard in the section name process wildcards
;; NOTE: we are processing the curr-section-name, NOT section-name.
(process-wildcards res curr-section-name)
(if (not (hash-table-ref/default res section-name #f))(hash-table-set! res section-name '())) ;; ensure that mere mention of a section is not lost
(loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings)
;; if we have the sections list then force all settings into "" and delete it later?
;; (if (or (not sections)
;; (member section-name sections))
;; section-name "") ;; stick everything into "". NOPE: We need new strategy. Put stuff in correct sections and then delete all sections later.
section-name
#f #f)))
|
| ︙ | ︙ |
Modified megatest.config from [c34072fd64] to [ec85813c67].
| ︙ | ︙ | |||
16 17 18 19 20 21 22 | [contours] # mode-patt/tag-expr quick selector=QUICKPATT/quick full areas=fullrun,ext-tests; selector=MAXPATT/ all areas=fullrun,ext-tests snazy areas=%; selector=QUICKPATT/ | > | 16 17 18 19 20 21 22 23 | [contours] # mode-patt/tag-expr quick selector=QUICKPATT/quick full areas=fullrun,ext-tests; selector=MAXPATT/ all areas=fullrun,ext-tests snazy areas=%; selector=QUICKPATT/ [nopurpose] |