From 1a0965045bfa7eb277efb0cd8c3513b5c03ba810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 20 Jan 2015 22:26:15 +0100 Subject: guix package: Avoid spurious warnings from 'find-files'. Reported by Andreas Enge . * guix/scripts/package.scm (with-null-error-port): New macro. (search-path-environment-variables): Wrap 'search-path-as-list' call in 'with-null-error-port'. --- guix/scripts/package.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 30b0658198..1ff898d8dd 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013 Mark H Weaver ;;; Copyright © 2014 Alex Kost @@ -331,6 +331,11 @@ an output path different than CURRENT-PATH." ;;; Search paths. ;;; +(define-syntax-rule (with-null-error-port exp) + "Evaluate EXP with the error port pointing to the bit bucket." + (with-error-to-port (%make-void-port "w") + (lambda () exp))) + (define* (search-path-environment-variables entries profile #:optional (getenv getenv)) "Return environment variable definitions that may be needed for the use of @@ -373,9 +378,14 @@ current settings and report only settings not already effective." (files (if pattern (map (cut string-append <> "/") files) files)) - (path (search-path-as-list files (list profile) - #:type type - #:pattern pattern))) + + ;; XXX: Silence 'find-files' when it stumbles upon non-existent + ;; directories (see + ;; .) + (path (with-null-error-port + (search-path-as-list files (list profile) + #:type type + #:pattern pattern)))) (if (every (cut member <> values) path) #f (format #f "export ~a=\"~a\"" -- cgit v1.2.3