nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

profiles: Report version numbers in a separate column. 

* guix/profiles.scm (manifest-show-transaction)[package-strings,
  upgrade-strings]: Show version number in separate column.  Show OUTPUT
  in first column, and only when it's different from "out".
This commit is contained in:
Ludovic Courtès 2014-09-02 21:25:57 +02:00
parent ef8993e2dc
commit 9a91476431
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/profiles.scm
View File

@ -333,7 +333,9 @@ replacement if PORT is not Unicode-capable."
"Display what will/would be installed/removed from MANIFEST by TRANSACTION." "Display what will/would be installed/removed from MANIFEST by TRANSACTION."
(define (package-strings name version output item) (define (package-strings name version output item)
(map (lambda (name version output item) (map (lambda (name version output item)
(format #f " ~a-~a\t~a\t~a" name version output (format #f " ~a~:[:~a~;~*~]\t~a\t~a"
name
(equal? output "out") output version
(if (package? item) (if (package? item)
(package-output store item output) (package-output store item output)
item))) item)))
@ -343,9 +345,9 @@ replacement if PORT is not Unicode-capable."
(right-arrow (current-error-port))) (right-arrow (current-error-port)))
(define (upgrade-string name old-version new-version output item) (define (upgrade-string name old-version new-version output item)
(format #f " ~a\t~a ~a ~a\t~a\t~a" name (format #f " ~a~:[:~a~;~*~]\t~a ~a ~a\t~a"
name (equal? output "out") output
old-version → new-version old-version → new-version
output
(if (package? item) (if (package? item)
(package-output store item output) (package-output store item output)
item))) item)))
@ -353,7 +355,7 @@ replacement if PORT is not Unicode-capable."
(let-values (((remove install upgrade) (let-values (((remove install upgrade)
(manifest-transaction-effects manifest transaction))) (manifest-transaction-effects manifest transaction)))
(match remove (match remove
((($ <manifest-entry> name version output item _) ..1) ((($ <manifest-entry> name version output item) ..1)
(let ((len (length name)) (let ((len (length name))
(remove (package-strings name version output item))) (remove (package-strings name version output item)))
(if dry-run? (if dry-run?