summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-10-09 10:52:39 +0200
committerLudovic Courtès <ludo@gnu.org>2018-10-09 18:54:12 +0200
commite54aec7b8e5ef1aa53df043e3c0b06f25d2936a4 (patch)
tree63e2788d310c07d3895e2103fa1d8eeb01faff4e /guix/scripts
parentfe17037b387c6eca0c45f0526d2761e982a192bb (diff)
downloadgnu-guix-e54aec7b8e5ef1aa53df043e3c0b06f25d2936a4.tar
gnu-guix-e54aec7b8e5ef1aa53df043e3c0b06f25d2936a4.tar.gz
pull: '-l' now honors '-p'.
* guix/scripts/pull.scm (process-query): Add 'profile' parameter and remove 'profile' local variable. (guix-pull): Adjust caller.
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/pull.scm9
1 files changed, 3 insertions, 6 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 803f7cf142..0d65857beb 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -341,11 +341,8 @@ and ALIST2 differ, display HEADING upfront."
(display-new/upgraded-packages (package-alist gen1)
(package-alist gen2)))
-(define (process-query opts)
- "Process any query specified by OPTS."
- (define profile
- (string-append (config-directory) "/current"))
-
+(define (process-query opts profile)
+ "Process any query on PROFILE specified by OPTS."
(match (assoc-ref opts 'query)
(('list-generations pattern)
(define (list-generations profile numbers)
@@ -445,7 +442,7 @@ Use '~/.config/guix/channels.scm' instead."))
(string-append (config-directory) "/current"))))
(cond ((assoc-ref opts 'query)
- (process-query opts))
+ (process-query opts profile))
((assoc-ref opts 'dry-run?)
#t) ;XXX: not very useful
(else