guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/05: refresh: Be more verbose when passed an explicit package list.


From: Ludovic Courtès
Subject: 03/05: refresh: Be more verbose when passed an explicit package list.
Date: Sat, 24 Jun 2017 17:28:30 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 4c228f9e54180ffe733957fee586fc7179f64e28
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jun 24 18:58:44 2017 +0200

    refresh: Be more verbose when passed an explicit package list.
    
    * guix/scripts/refresh.scm (check-for-package-update): Use
    'version-compare' instead of 'version>?'.  When WARN? is true, print
    something for the '=' and '<' cases.
---
 guix/scripts/refresh.scm | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index dd93e7d..5add64d 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -253,15 +253,32 @@ downloaded and authenticated; not updating~%")
 WARN? is true and no updater exists for PACKAGE, print a warning."
   (match (package-latest-release package updaters)
     ((? upstream-source? source)
-     (when (version>? (upstream-source-version source)
-                      (package-version package))
-       (let ((loc (or (package-field-location package 'version)
-                      (package-location package))))
-         (format (current-error-port)
-                 (G_ "~a: ~a would be upgraded from ~a to ~a~%")
-                 (location->string loc)
-                 (package-name package) (package-version package)
-                 (upstream-source-version source)))))
+     (let ((loc (or (package-field-location package 'version)
+                    (package-location package))))
+       (case (version-compare (upstream-source-version source)
+                              (package-version package))
+         ((>)
+          (format (current-error-port)
+                  (G_ "~a: ~a would be upgraded from ~a to ~a~%")
+                  (location->string loc)
+                  (package-name package) (package-version package)
+                  (upstream-source-version source)))
+         ((=)
+          (when warn?
+            (format (current-error-port)
+                    (G_ "~a: info: ~a is already the latest version of ~a~%")
+                    (location->string loc)
+                    (package-version package)
+                    (package-name package))))
+         (else
+          (when warn?
+            (format (current-error-port)
+                    (G_ "~a: warning: ~a is greater than \
+the latest known version of ~a (~a)~%")
+                    (location->string loc)
+                    (package-version package)
+                    (package-name package)
+                    (upstream-source-version source)))))))
     (#f
      (when warn?
        (warn-no-updater package)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]