01/04: utils: Handle #f file-name.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit b997d43214445462f23947afbbcadf24c6018217
Author: Alex Sassmannshausen <address@hidden>
Date:   Mon Apr 8 15:18:23 2019 +0100

    utils: Handle #f file-name.
    
    * guix/utils.scm (current-source-directory): Change dispatch to handle #f
    file-name.
    
    Signed-off-by: Maxim Cournoyer <address@hidden>
---
 guix/utils.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/guix/utils.scm b/guix/utils.scm
index 1f99c5b..64853f2 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -782,13 +782,11 @@ be determined."
           ;; the absolute file name by looking at %LOAD-PATH; doing this at
           ;; run time rather than expansion time is necessary to allow files
           ;; to be moved on the file system.
-          (cond ((not file-name)
-                 #f)                ;raising an error would upset Geiser users
-                ((string-prefix? "/" file-name)
-                 (dirname file-name))
-                (else
-                 #`(absolute-dirname #,file-name))))
-         (#f
+          (if (string-prefix? "/" file-name)
+              (dirname file-name)
+              #`(absolute-dirname #,file-name)))
+         ((or ('filename . #f) #f)
+          ;; raising an error would upset Geiser users
           #f))))))
 
 ;; A source location.