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 /guix/http-client.scm | |
| parent | baed8816fcd6665319c342a1d4c117198af33dc2 (diff) | |
| download | gnu-guix-7db3ff4a29415ccc4f781c3e2450deb97d51a26f.tar gnu-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 'guix/http-client.scm')
| -rw-r--r-- | guix/http-client.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/http-client.scm b/guix/http-client.scm index 898b1669e5..11231cbc1e 100644 --- a/guix/http-client.scm +++ b/guix/http-client.scm @@ -133,7 +133,7 @@ closed it will also close PORT, unless the KEEP-ALIVE? is true." (get-bytevector-all (response-port r)))))) ;; Install this patch only on Guile 2.0.5. - (when (version>? "2.0.6" (version)) + (unless (guile-version>? "2.0.5") (module-set! (resolve-module '(web response)) 'read-response-body read-response-body*))) @@ -163,7 +163,7 @@ unbuffered port, suitable for use in `filtered-port'." ;; Try hard to use the API du jour to get an input port. ;; On Guile 2.0.5 and before, we can only get a string or ;; bytevector, and not an input port. Work around that. - (if (version>? (version) "2.0.7") + (if (guile-version>? "2.0.7") (http-get uri #:streaming? #t #:port port) ; 2.0.9+ (if (defined? 'http-get*) (http-get* uri #:decode-body? text? |