[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: utils: Add 'version>=?'.
From: |
Ludovic Courtès |
Subject: |
01/03: utils: Add 'version>=?'. |
Date: |
Mon, 09 Feb 2015 17:18:50 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit cde1e967cfc0849c7010eda0bc700dadf222275f
Author: Ludovic Courtès <address@hidden>
Date: Mon Feb 9 17:17:07 2015 +0100
utils: Add 'version>=?'.
* guix/utils.scm (version>?): Clarify docstring.
(version>=?): New procedure.
---
guix/utils.scm | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/guix/utils.scm b/guix/utils.scm
index 1c619c3..3d38ba1 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2013, 2014, 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2014 Eric Bavier <address@hidden>
;;; Copyright © 2014 Ian Denhardt <address@hidden>
@@ -67,6 +67,7 @@
%current-target-system
version-compare
version>?
+ version>=?
version-prefix
version-major+minor
guile-version>?
@@ -554,9 +555,15 @@ minor version numbers from version-string."
(version-prefix version-string 2))
(define (version>? a b)
- "Return #t when A denotes a newer version than B."
+ "Return #t when A denotes a version strictly newer than B."
(eq? '> (version-compare a b)))
+(define (version>=? a b)
+ "Return #t when A denotes a version newer or equal to B."
+ (case (version-compare a b)
+ ((> =) #t)
+ (else #f)))
+
(define (guile-version>? str)
"Return #t if the running Guile version is greater than STR."
;; Note: Using (version>? (version) "2.0.5") or similar doesn't work,