summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-10-15 23:14:47 +0200
committerLudovic Courtès <ludo@gnu.org>2021-10-15 23:16:29 +0200
commit058ea2672b8e2e3bb3097651727bf7e7e1aee1f5 (patch)
tree8a70ca13cc333ecca57bad5e4fe0d6112c23d57d
parent7770016402ef7864cc8e0a88c0428848f3ea7678 (diff)
downloadguix-058ea2672b8e2e3bb3097651727bf7e7e1aee1f5.tar.gz
refresh: Report suggested input changes with 'info'.
* guix/scripts/refresh.scm (update-package): Define 'field', 'name',
'loc', and 'change-name'.  Use 'info' rather than 'format' to report
suggested input changes.
-rw-r--r--guix/scripts/refresh.scm52
1 files changed, 34 insertions, 18 deletions
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index fb6c52a567..8806f0f740 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
@@ -329,23 +329,39 @@ warn about packages that have no matching updater."
                       (package-version package) version)
                 (for-each
                  (lambda (change)
-                   (format (current-error-port)
-                           (match (list (upstream-input-change-action change)
-                                        (upstream-input-change-type change))
-                             (('add 'regular)
-                              (G_ "~a: consider adding this input: ~a~%"))
-                             (('add 'native)
-                              (G_ "~a: consider adding this native input: ~a~%"))
-                             (('add 'propagated)
-                              (G_ "~a: consider adding this propagated input: ~a~%"))
-                             (('remove 'regular)
-                              (G_ "~a: consider removing this input: ~a~%"))
-                             (('remove 'native)
-                              (G_ "~a: consider removing this native input: ~a~%"))
-                             (('remove 'propagated)
-                              (G_ "~a: consider removing this propagated input: ~a~%")))
-                           (package-name package)
-                           (upstream-input-change-name change)))
+                   (define field
+                     (match (upstream-input-change-type change)
+                       ('native 'native-inputs)
+                       ('propagated 'propagated-inputs)
+                       (_ 'inputs)))
+
+                   (define name
+                     (package-name package))
+                   (define loc
+                     (package-field-location package field))
+                   (define change-name
+                     (upstream-input-change-name change))
+
+                   (match (list (upstream-input-change-action change)
+                                (upstream-input-change-type change))
+                     (('add 'regular)
+                      (info loc (G_ "~a: consider adding this input: ~a~%")
+                            name change-name))
+                     (('add 'native)
+                      (info loc (G_ "~a: consider adding this native input: ~a~%")
+                            name change-name))
+                     (('add 'propagated)
+                      (info loc (G_ "~a: consider adding this propagated input: ~a~%")
+                            name change-name))
+                     (('remove 'regular)
+                      (info loc (G_ "~a: consider removing this input: ~a~%")
+                            name change-name))
+                     (('remove 'native)
+                      (info loc (G_ "~a: consider removing this native input: ~a~%")
+                            name change-name))
+                     (('remove 'propagated)
+                      (info loc (G_ "~a: consider removing this propagated input: ~a~%")
+                            name change-name))))
                  (upstream-source-input-changes source))
                 (let ((hash (call-with-input-file tarball
                               port-sha256)))