[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: pull: '-l' now honors '-p'.
From: |
Ludovic Courtès |
Subject: |
03/06: pull: '-l' now honors '-p'. |
Date: |
Tue, 9 Oct 2018 12:54:28 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit e54aec7b8e5ef1aa53df043e3c0b06f25d2936a4
Author: Ludovic Courtès <address@hidden>
Date: Tue Oct 9 10:52:39 2018 +0200
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 803f7cf..0d65857 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
- branch master updated (1fe57b3 -> b33e191), Ludovic Courtès, 2018/10/09
- 03/06: pull: '-l' now honors '-p'.,
Ludovic Courtès <=
- 05/06: gnu: Add ttf2pt1., Ludovic Courtès, 2018/10/09
- 04/06: profiles: Make Geiser happy., Ludovic Courtès, 2018/10/09
- 02/06: status: Gracefully handle invalid UTF-8 in build logs., Ludovic Courtès, 2018/10/09
- 01/06: tests: "make check-system" produces colored output., Ludovic Courtès, 2018/10/09
- 06/06: guix build: '-f' accepts file-like objects., Ludovic Courtès, 2018/10/09