[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/21: import: gnome: Reject version strings such as "43.alpha".
From: |
guix-commits |
Subject: |
04/21: import: gnome: Reject version strings such as "43.alpha". |
Date: |
Thu, 8 Sep 2022 10:24:06 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 392e97ed0800ff3ed56bfe8cd54350a8bc2f9817
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Sep 8 12:20:28 2022 +0200
import: gnome: Reject version strings such as "43.alpha".
Reported by Maxim Cournoyer.
This is a followup to 61b63e7fa73be8828af2b36d196c3676c974e119.
* guix/import/gnome.scm (latest-gnome-release)[even-minor-version?]:
Reject VERSION is the minor or micro part is not an integer.
---
guix/import/gnome.scm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/guix/import/gnome.scm b/guix/import/gnome.scm
index 3915f19e84..49ad7169fd 100644
--- a/guix/import/gnome.scm
+++ b/guix/import/gnome.scm
@@ -62,14 +62,16 @@ not be determined."
(define (even-minor-version? version)
(match (string-tokenize version %not-dot)
- (((= string->number major) (= string->number minor) micro)
+ (((= string->number major) (= string->number minor) (= string->number
micro))
;; This is for things like GLib, with version strings like "2.72.3".
- (and minor (even? minor)))
- (((= string->number major) . _)
+ (and minor (even? minor) micro))
+ (((= string->number major) (= string->number minor))
;; 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)))
+ ;; integers) and are not subject to the odd/even policy. MAJOR and
+ ;; MINOR should be valid numbers though; "43.alpha" is rejected.
+ (and major minor))
+ (_
+ #f)))
(define upstream-name
;; Some packages like "NetworkManager" have camel-case names.
- 10/21: gnu: Add mimalloc., (continued)
- 10/21: gnu: Add mimalloc., guix-commits, 2022/09/08
- 14/21: gnu: Add texlive-latex-lastpage., guix-commits, 2022/09/08
- 12/21: gnu: podman: Use G-expressions., guix-commits, 2022/09/08
- 09/21: gnu: man-pages: Update to new style., guix-commits, 2022/09/08
- 19/21: gnu: dragon-drop: Update to 1.2.0., guix-commits, 2022/09/08
- 21/21: services: agetty-service-type: Add missing dash., guix-commits, 2022/09/08
- 03/21: search-paths: Tweak $SSL_CERT_DIR comment., guix-commits, 2022/09/08
- 17/21: gnu: Add texlive-latex-totcount., guix-commits, 2022/09/08
- 20/21: gnu: strawberry: Update to 1.0.9., guix-commits, 2022/09/08
- 06/21: file-systems: Open files with O_CLOEXEC., guix-commits, 2022/09/08
- 04/21: import: gnome: Reject version strings such as "43.alpha".,
guix-commits <=
- 05/21: syscalls: Avoid repeated calls to 'syscall->procedure'., guix-commits, 2022/09/08
- 13/21: gnu: podman: Update to 4.2.0., guix-commits, 2022/09/08
- 11/21: gnu: Add solvespace., guix-commits, 2022/09/08
- 07/21: gnu: zsh-autopair., guix-commits, 2022/09/08
- 15/21: gnu: Add texlive-latex-tabto-ltx., guix-commits, 2022/09/08
- 16/21: gnu: Add texlive-generic-soul., guix-commits, 2022/09/08
- 18/21: gnu: flatpak: Update to 1.14.0., guix-commits, 2022/09/08