unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: 28709@debbugs.gnu.org
Subject: bug#28709: [PATCH 1/4] download: Remove old-Guile leftovers.
Date: Tue, 17 Oct 2017 10:48:04 +0200	[thread overview]
Message-ID: <20171017084807.15901-2-ludo@gnu.org> (raw)
In-Reply-To: <20171017084807.15901-1-ludo@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

  reply	other threads:[~2017-10-17  8:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-04 21:49 bug#28709: Content-addressed mirrors for Git checkouts Ludovic Courtès
2017-10-17  8:48 ` bug#28709: [PATCH 0/4] Content-addressed mirrors for VCS checkouts Ludovic Courtès
2017-10-17  8:48   ` Ludovic Courtès [this message]
2017-10-17  8:48   ` bug#28709: [PATCH 2/4] download: Make 'http-fetch' public Ludovic Courtès
2017-10-17  8:48   ` bug#28709: [PATCH 3/4] Add (guix progress) Ludovic Courtès
2017-10-17  8:48   ` bug#28709: [PATCH 4/4] download: Download a nar when a VCS checkout fails Ludovic Courtès
2017-10-18 17:58   ` bug#28709: [PATCH 0/4] Content-addressed mirrors for VCS checkouts Christopher Baines
2017-10-19 21:26     ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171017084807.15901-2-ludo@gnu.org \
    --to=ludo@gnu.org \
    --cc=28709@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).