diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-01-07 10:57:18 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-09 14:47:53 +0100 |
| commit | 76832d3420594c8b5feaf7682b84b5481a49a076 (patch) | |
| tree | 262f1f36a3773710cf02106f094982004d497921 /tests/publish.scm | |
| parent | c3d9bca48a95a535a26eda38707dcd9798400ff3 (diff) | |
Remove most uses of the _IO*F constants.
These constants, for use with 'setvbuf', were deprecated in Guile 2.2
and disappeared in Guile 3.0. Here we keep these constants in
build-side code where removing them is not feasible.
* guix/build/download-nar.scm (download-nar): Adjust 'setvbuf' calls to
the Guile 2.2+ API.
* guix/build/download.scm (open-socket-for-uri): Likewise.
(open-connection-for-uri, url-fetch): Likewise.
* guix/build/make-bootstrap.scm (make-stripped-libc): Likewise.
* guix/build/union.scm (setvbuf) [guile-2.0]: New conditional wrapper.
(union-build): Adjust to new API.
* guix/ftp-client.scm (ftp-open, ftp-list, ftp-retr): Likewise.
* guix/http-client.scm (http-fetch): Likewise.
* guix/inferior.scm (proxy): Likewise.
* guix/scripts/substitute.scm (fetch, http-multiple-get): Likewise.
* guix/self.scm (compiled-modules): Likewise.
* guix/ssh.scm (remote-daemon-channel, store-import-channel)
(store-export-channel): Likewise.
* guix/ui.scm (initialize-guix): Likewise.
* tests/publish.scm (http-get-port): Likewise.
* guix/store.scm (%newlines): Adjust comment.
Diffstat (limited to 'tests/publish.scm')
| -rw-r--r-- | tests/publish.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/publish.scm b/tests/publish.scm index 79a786e723d..097ac036e0b 100644 --- a/tests/publish.scm +++ b/tests/publish.scm | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2015 David Thompson <davet@gnu.org> | 2 | ;;; Copyright © 2015 David Thompson <davet@gnu.org> |
| 3 | ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> | 3 | ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> |
| 4 | ;;; | 4 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 5 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 6 | ;;; |
| @@ -63,12 +63,12 @@ | |||
| 63 | (let ((socket (open-socket-for-uri uri))) | 63 | (let ((socket (open-socket-for-uri uri))) |
| 64 | ;; Make sure to use an unbuffered port so that we can then peek at the | 64 | ;; Make sure to use an unbuffered port so that we can then peek at the |
| 65 | ;; underlying file descriptor via 'call-with-gzip-input-port'. | 65 | ;; underlying file descriptor via 'call-with-gzip-input-port'. |
| 66 | (setvbuf socket _IONBF) | 66 | (setvbuf socket 'none) |
| 67 | (call-with-values | 67 | (call-with-values |
| 68 | (lambda () | 68 | (lambda () |
| 69 | (http-get uri #:port socket #:streaming? #t)) | 69 | (http-get uri #:port socket #:streaming? #t)) |
| 70 | (lambda (response port) | 70 | (lambda (response port) |
| 71 | ;; Don't (setvbuf port _IONBF) because of <http://bugs.gnu.org/19610> | 71 | ;; Don't (setvbuf port 'none) because of <http://bugs.gnu.org/19610> |
| 72 | ;; (PORT might be a custom binary input port). | 72 | ;; (PORT might be a custom binary input port). |
| 73 | port)))) | 73 | port)))) |
| 74 | 74 | ||
