Message ID | c2ca777e9b3e9dbdc80d85ef02b3d27407f1122a.1585667732.git.leo@famulari.name |
---|---|
State | Accepted |
Headers | show |
Series | [bug#40350] ui: Mention that changes to package definitions can cause "upgrades". | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
Hi, Leo Famulari <leo@famulari.name> skribis: > * guix/ui.scm (show-manifest-transaction)[upgrade-string]: Use the > package name in UI message. [...] > (if (string=? old new) > - (G_ "(dependencies changed)") > + (format > + (G_ "(dependencies or ~a package recipe changed)") Is that not implied in a way? If it is, how about something shorter like: (dependencies or package changed) ? Thanks, Ludo’.
On Wed, Apr 01, 2020 at 11:03:22PM +0200, Ludovic Courtès wrote: > Is that not implied in a way? It is, but I think we will still get some confused users asking about it. > If it is, how about something shorter like: > > (dependencies or package changed) Yeah, I think that's okay.
Hi, Leo Famulari <leo@famulari.name> skribis: > On Wed, Apr 01, 2020 at 11:03:22PM +0200, Ludovic Courtès wrote: >> Is that not implied in a way? > > It is, but I think we will still get some confused users asking about > it. > >> If it is, how about something shorter like: >> >> (dependencies or package changed) > > Yeah, I think that's okay. OK, done! Thanks, Ludo’.
diff --git a/guix/ui.scm b/guix/ui.scm index 1e24fe5dca..20b1e79ca9 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Simon Tournier <zimon.toutoune@gmail.com> +;;; Copyright © 2020 Leo Famulari <leo@famulari.name> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1162,11 +1163,13 @@ separator between subsequent columns." name (string-append name ":" output))) names outputs) - (map (lambda (old new) + (map (lambda (old new name) (if (string=? old new) - (G_ "(dependencies changed)") + (format + (G_ "(dependencies or ~a package recipe changed)") + name) (string-append old " " → " " new))) - old-version new-version)) + old-version new-version names)) #:initial-indent 3)) (let-values (((remove install upgrade downgrade)