From e54aec7b8e5ef1aa53df043e3c0b06f25d2936a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 9 Oct 2018 10:52:39 +0200 Subject: [PATCH] pull: '-l' now honors '-p'. * guix/scripts/pull.scm (process-query): Add 'profile' parameter and remove 'profile' local variable. (guix-pull): Adjust caller. --- guix/scripts/pull.scm | 9 +++------ 1 file 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 -- 2.20.1