summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-03-17 15:03:19 +0100
committerLudovic Courtès <ludo@gnu.org>2021-03-17 23:10:19 +0100
commitc81eeabb99f89f2b7bf1417bfbf992ba47af02a5 (patch)
treeee314352f5a181459239a027dbc738bc3e05122b
parentc37f78a9f55874015d10f081be36104bb33a3ae1 (diff)
downloadguix-c81eeabb99f89f2b7bf1417bfbf992ba47af02a5.tar.gz
import: gnome: Exclude version numbers that do not start with a digit.
Fixes a bug whereby NetworkManager would be updated to version "rc2".

* guix/import/gnome.scm (latest-gnome-release)[even-minor-version?]:
Change catch-all case to return #f when the first part is not a digit.
-rw-r--r--guix/import/gnome.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/import/gnome.scm b/guix/import/gnome.scm
index 436ec88ef9..c0ee1bfa5d 100644
--- a/guix/import/gnome.scm
+++ b/guix/import/gnome.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,8 +64,9 @@ not be determined."
     (match (string-tokenize version %not-dot)
       (((= string->number major) (= string->number minor) . rest)
        (and minor (even? minor)))
-      (_
-       #t)))                                      ;cross fingers
+      (((= string->number major) . _)
+       ;; It should at last start with a digit.
+       major)))
 
   (define upstream-name
     ;; Some packages like "NetworkManager" have camel-case names.