01/09: import: gnome: Do not require even minor for two-number version strings.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 61b63e7fa73be8828af2b36d196c3676c974e119
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Sep 6 15:59:59 2022 +0200

    import: gnome: Do not require even minor for two-number version strings.
    
    That way, "guix refresh gnome-keyring" will properly return "42.1"
    instead of "42.0".
    
    Reported by Maxim Cournoyer.
    
    * guix/import/gnome.scm (latest-gnome-release)[even-minor-version?]:
    Tweak for GNOME applications.
---
 guix/import/gnome.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/import/gnome.scm b/guix/import/gnome.scm
index 43966c1028..3915f19e84 100644
--- a/guix/import/gnome.scm
+++ b/guix/import/gnome.scm
@@ -62,10 +62,13 @@ not be determined."
 
   (define (even-minor-version? version)
     (match (string-tokenize version %not-dot)
-      (((= string->number major) (= string->number minor) . rest)
+      (((= string->number major) (= string->number minor) micro)
+       ;; This is for things like GLib, with version strings like "2.72.3".
        (and minor (even? minor)))
       (((= string->number major) . _)
-       ;; It should at last start with a digit.
+       ;; GNOME applications have version strings like "42.1" (only two
+       ;; integers) and are not subject to the odd/even policy.  MAJOR should
+       ;; be a valid number though.
        major)))
 
   (define upstream-name