mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-12 14:16:55 -05:00
pull: '-l' now honors '-p'.
* guix/scripts/pull.scm (process-query): Add 'profile' parameter and remove 'profile' local variable. (guix-pull): Adjust caller.
This commit is contained in:
parent
fe17037b38
commit
e54aec7b8e
1 changed files with 3 additions and 6 deletions
|
@ -341,11 +341,8 @@ (define (package-alist generation)
|
||||||
(display-new/upgraded-packages (package-alist gen1)
|
(display-new/upgraded-packages (package-alist gen1)
|
||||||
(package-alist gen2)))
|
(package-alist gen2)))
|
||||||
|
|
||||||
(define (process-query opts)
|
(define (process-query opts profile)
|
||||||
"Process any query specified by OPTS."
|
"Process any query on PROFILE specified by OPTS."
|
||||||
(define profile
|
|
||||||
(string-append (config-directory) "/current"))
|
|
||||||
|
|
||||||
(match (assoc-ref opts 'query)
|
(match (assoc-ref opts 'query)
|
||||||
(('list-generations pattern)
|
(('list-generations pattern)
|
||||||
(define (list-generations profile numbers)
|
(define (list-generations profile numbers)
|
||||||
|
@ -445,7 +442,7 @@ (define (guix-pull . args)
|
||||||
(string-append (config-directory) "/current"))))
|
(string-append (config-directory) "/current"))))
|
||||||
|
|
||||||
(cond ((assoc-ref opts 'query)
|
(cond ((assoc-ref opts 'query)
|
||||||
(process-query opts))
|
(process-query opts profile))
|
||||||
((assoc-ref opts 'dry-run?)
|
((assoc-ref opts 'dry-run?)
|
||||||
#t) ;XXX: not very useful
|
#t) ;XXX: not very useful
|
||||||
(else
|
(else
|
||||||
|
|
Loading…
Reference in a new issue