diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-08-23 15:51:36 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-08-23 15:51:36 +0200 |
commit | 7db3ff4a29415ccc4f781c3e2450deb97d51a26f (patch) | |
tree | 459549425e83a80457a5261da57545c8e32f0455 /tests | |
parent | baed8816fcd6665319c342a1d4c117198af33dc2 (diff) | |
download | guix-7db3ff4a29415ccc4f781c3e2450deb97d51a26f.tar guix-7db3ff4a29415ccc4f781c3e2450deb97d51a26f.tar.gz |
utils: Add `guile-version>?', and use it.
This fixes Guile version comparisons when (version) has a
vendor-specific suffix.
Reported by Andreas Enge <andreas@enge.fr>.
* guix/utils.scm (guile-version>?): New procedure.
* tests/utils.scm ("guile-version>? 1.8", "guile-version>? 10.5"): New
tests.
* guix/scripts/substitute-binary.scm (fetch, progress-report-port): Use
`guile-version>?' instead of `version>?'.
* guix/http-client.scm (when-guile<=2.0.5, http-fetch): Likewise.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/utils.scm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/utils.scm b/tests/utils.scm index 3be60e443d..4f6ecc514d 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -66,6 +66,12 @@ ("nixpkgs" "1.0pre22125_a28fe19") ("gtk2" "2.38.0")))) +(test-assert "guile-version>? 1.8" + (guile-version>? "1.8")) + +(test-assert "guile-version>? 10.5" + (not (guile-version>? "10.5"))) + (test-equal "string-tokenize*" '(("foo") ("foo" "bar" "baz") |