Hide stderr by combining it with the captured output => no stderr messages.

(Also, a slightly nicer string for the case of using the file timestamp.)
This commit is contained in:
Eli Barzilay 2010-05-12 11:14:16 -04:00
parent 8f74a69d44
commit 8f5b1f622c

View File

@ -11,7 +11,7 @@
(define-runtime-path this "stamp.rkt") (define-runtime-path this "stamp.rkt")
(define stamp (define stamp
(let ([rx:secs+id #rx"^([0-9]+)\\|([0-9a-f]+)\\|(.*?)[ \r\n]*$"]) (let ([rx:secs+id #rx"^([0-9]+)\\|([0-9a-f]+|-)\\|(.*?)[ \r\n]*$"])
(for*/or ([x (list (for*/or ([x (list
;; info from an archive (incl. nightly builds) ;; info from an archive (incl. nightly builds)
(lambda () archive-id) (lambda () archive-id)
@ -21,13 +21,14 @@
(find-executable-path "git.exe"))]) (find-executable-path "git.exe"))])
(and exe (and exe
(let ([out (open-output-string)]) (let ([out (open-output-string)])
(parameterize ([current-output-port out]) (parameterize ([current-output-port out]
[current-error-port out])
(system* exe "log" "-1" (system* exe "log" "-1"
"--pretty=format:%ct|%h|g") "--pretty=format:%ct|%h|g")
(get-output-string out)))))) (get-output-string out))))))
;; fallback: get the date of this file, no id ;; fallback: get the date of this file, no id
(lambda () (lambda ()
(format "~a|0|f" (format "~a|-|f"
(file-or-directory-modify-seconds this))))]) (file-or-directory-modify-seconds this))))])
(let* ([x (x)] (let* ([x (x)]
[m (and (string? x) (regexp-match rx:secs+id x))] [m (and (string? x) (regexp-match rx:secs+id x))]