summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorSimon Tournier <zimon.toutoune@gmail.com>2023-11-02 21:25:43 +0100
committerSimon Tournier <zimon.toutoune@gmail.com>2023-11-05 16:11:17 +0100
commit1eb3133355ef14d6d4c8648504a7e013338779a8 (patch)
tree9bd78ca9dca6cf82d1496611b96932a6d19d214e /guix/scripts
parentab94e80601a5b23f44e7455b3443457b4a99a1e5 (diff)
scripts: edit: Fix relative file-name with 'load-path' option.
* guix/scripts/edit.scm (search-path*): Return 'file' if exists when 'search-path' fails. Change-Id: I891d63d0d28577a7d1732fc59435828ecc0a5c5a
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/edit.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm
index ff2d529bcf..b7b4cd2514 100644
--- a/guix/scripts/edit.scm
+++ b/guix/scripts/edit.scm
@@ -64,7 +64,11 @@ Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"))
(define (search-path* path file)
"Like 'search-path' but exit if FILE is not found."
- (let ((absolute-file-name (search-path path file)))
+ (let ((absolute-file-name (or (search-path path file)
+ ;; It could be that FILE is a relative name
+ ;; i.e., not relative to an element of PATH.
+ (and (file-exists? file)
+ file))))
(unless absolute-file-name
;; Shouldn't happen unless somebody fiddled with the 'location' field.
(leave (G_ "file '~a' not found in search path ~s~%")