From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Subject: bug#28709: [PATCH 1/4] download: Remove old-Guile leftovers. Date: Tue, 17 Oct 2017 10:48:04 +0200 Message-ID: <20171017084807.15901-2-ludo@gnu.org> References: <20171017084807.15901-1-ludo@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4NYh-0001hK-5Q for bug-guix@gnu.org; Tue, 17 Oct 2017 04:49:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4NYc-0003Mp-DS for bug-guix@gnu.org; Tue, 17 Oct 2017 04:49:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36150) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4NYc-0003Ml-9v for bug-guix@gnu.org; Tue, 17 Oct 2017 04:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e4NYc-0001L8-2l for bug-guix@gnu.org; Tue, 17 Oct 2017 04:49:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20171017084807.15901-1-ludo@gnu.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 28709@debbugs.gnu.org This is a followup to 36626c556ed75219bce196ac93d148f6b9af984c. * guix/build/download.scm (http-fetch): Rename 'port-or-bv' to 'port'. Assume (port? port) is always true, and remove other branch. --- guix/build/download.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/guix/build/download.scm b/guix/build/download.scm index 9490f4805..e227ae598 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -774,7 +774,7 @@ certificates; otherwise simply ignore them." #:timeout timeout #:verify-certificate? verify-certificate?)) - ((resp bv-or-port) + ((resp port) (http-get uri #:port connection #:decode-body? #f #:streaming? #t #:headers headers)) @@ -787,14 +787,11 @@ certificates; otherwise simply ignore them." (begin (call-with-output-file file (lambda (p) - (if (port? bv-or-port) - (begin - (dump-port* bv-or-port p - #:buffer-size %http-receive-buffer-size - #:reporter (progress-reporter/file - (uri-abbreviation uri) size)) - (newline)) - (put-bytevector p bv-or-port)))) + (dump-port* port p + #:buffer-size %http-receive-buffer-size + #:reporter (progress-reporter/file + (uri-abbreviation uri) size)) + (newline))) file)) ((301 ; moved permanently 302 ; found (redirection) -- 2.14.2