Megatest

Check-in [f2e853123a]
Login
Overview
Comment:Applied stash with better meta data in pkt for configs
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.65-use-pkts
Files: files | file ages | folders
SHA1: f2e853123a78898a65e3b73deffdad4c6d635340
User & Date: matt on 2017-05-25 23:17:04
Other Links: branch diff | manifest | tags
Context
2017-06-25
22:27
Brought up-to-date with latest v1.65 check-in: 12183f1846 user: matt tags: v1.65-use-pkts
2017-05-25
23:17
Applied stash with better meta data in pkt for configs check-in: f2e853123a user: matt tags: v1.65-use-pkts
23:16
Merged in updates from v1.65 check-in: 5cd9ae113c user: matt tags: v1.65-use-pkts
Changes

Modified configf.scm from [b8b42ff101] to [e5a95044d6].

227
228
229
230
231
232
233
234


235
236
237
238
239
240
241
;;
(define (read-config path ht allow-system #!key (environ-patt #f)            (curr-section #f)
		     (sections #f)              (settings (make-hash-table)) (keep-filenames #f)
		     (post-section-procs '())   (apply-wildcards #t))
  (debug:print 9 *default-log-port* "START: " path)
  (if *configdat*
      (common:save-pkt `((action . read-config)
			 (f      . ,path)


                         (T      . configf))
		       *configdat* #t add-only: #t))
  (if (and (not (port? path))
	   (not (file-exists? path))) ;; for case where we are handed a port
      (begin 
	(debug:print-info 1 *default-log-port* "read-config - file not found " path " current path: " (current-directory))
	;; WARNING: This is a risky change but really, we should not return an empty hash table if no file read?







|
>
>







227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
;;
(define (read-config path ht allow-system #!key (environ-patt #f)            (curr-section #f)
		     (sections #f)              (settings (make-hash-table)) (keep-filenames #f)
		     (post-section-procs '())   (apply-wildcards #t))
  (debug:print 9 *default-log-port* "START: " path)
  (if *configdat*
      (common:save-pkt `((action . read-config)
			 (f      . ,(cond ((string? path) path)
					  ((port?   path) "port")
					  (else (conc path))))
                         (T      . configf))
		       *configdat* #t add-only: #t))
  (if (and (not (port? path))
	   (not (file-exists? path))) ;; for case where we are handed a port
      (begin 
	(debug:print-info 1 *default-log-port* "read-config - file not found " path " current path: " (current-directory))
	;; WARNING: This is a risky change but really, we should not return an empty hash table if no file read?