mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
pull: Factorize pretty-printing for new/upgraded package lists.
* guix/scripts/pull.scm (display-new/upgraded-packages)[pretty]: New procedure. Use it.
This commit is contained in:
parent
f2bf0407de
commit
9f4169f6c8
1 changed files with 10 additions and 9 deletions
|
@ -382,6 +382,11 @@ (define* (display-new/upgraded-packages alist1 alist2
|
|||
"Given the two package name/version alists ALIST1 and ALIST2, display the
|
||||
list of new and upgraded packages going from ALIST1 to ALIST2. When ALIST1
|
||||
and ALIST2 differ, display HEADING upfront."
|
||||
(define (pretty str column)
|
||||
(indented-string (fill-paragraph str (- (%text-width) 4)
|
||||
column)
|
||||
4))
|
||||
|
||||
(let-values (((new upgraded) (new/upgraded-packages alist1 alist2)))
|
||||
(unless (and (null? new) (null? upgraded))
|
||||
(display heading))
|
||||
|
@ -392,21 +397,17 @@ (define* (display-new/upgraded-packages alist1 alist2
|
|||
(format #t (N_ " ~h new package: ~a~%"
|
||||
" ~h new packages: ~a~%" count)
|
||||
count
|
||||
(indented-string
|
||||
(fill-paragraph (string-join (sort (map first new) string<?)
|
||||
", ")
|
||||
(- (%text-width) 4) 30)
|
||||
4))))
|
||||
(pretty (string-join (sort (map first new) string<?)
|
||||
", ")
|
||||
30))))
|
||||
(match (length upgraded)
|
||||
(0 #t)
|
||||
(count
|
||||
(format #t (N_ " ~h package upgraded: ~a~%"
|
||||
" ~h packages upgraded: ~a~%" count)
|
||||
count
|
||||
(indented-string
|
||||
(fill-paragraph (string-join (sort upgraded string<?) ", ")
|
||||
(- (%text-width) 4) 35)
|
||||
4))))))
|
||||
(pretty (string-join (sort upgraded string<?) ", ")
|
||||
35))))))
|
||||
|
||||
(define (display-profile-content-diff profile gen1 gen2)
|
||||
"Display the changes in PROFILE GEN2 compared to generation GEN1."
|
||||
|
|
Loading…
Reference in a new issue