diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-21 22:44:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-21 22:44:15 +0100 |
| commit | b60d2bfff95c0859d7814c1fe9d0940c87edc2b4 (patch) | |
| tree | 49d3339f93c9d9fad5c66609a1dc4964f2856f79 /guix/utils.scm | |
| parent | 0c6ab52243353e3417e5a9733bb089e4771cc86e (diff) | |
| parent | a31b9dac1cbda07225fcdffe03d13d68c4eab981 (diff) | |
| download | guix-patches-b60d2bfff95c0859d7814c1fe9d0940c87edc2b4.tar guix-patches-b60d2bfff95c0859d7814c1fe9d0940c87edc2b4.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/utils.scm')
| -rw-r--r-- | guix/utils.scm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/guix/utils.scm b/guix/utils.scm index 1f99c5b3f5..64853f2989 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. |