From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxim Cournoyer Subject: bug#30270: [PATCH] url-fetch returns #t instead of FILE Date: Sat, 27 Jan 2018 12:35:44 -0500 Message-ID: <87o9lf6w7j.fsf@gmail.com> References: <87vafn6whf.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:32856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efUOd-00058l-4S for bug-guix@gnu.org; Sat, 27 Jan 2018 12:36:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efUOZ-0007aB-6e for bug-guix@gnu.org; Sat, 27 Jan 2018 12:36:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:37553) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1efUOY-0007Zb-Tr for bug-guix@gnu.org; Sat, 27 Jan 2018 12:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1efUOY-0000f9-HQ for bug-guix@gnu.org; Sat, 27 Jan 2018 12:36:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87vafn6whf.fsf@gmail.com> (Maxim Cournoyer's message of "Sat, 27 Jan 2018 12:29:48 -0500") 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: 30270@debbugs.gnu.org --=-=-= Content-Type: text/plain Maxim Cournoyer writes: > Hello! > > Commit 347fa4aebf, introduced a regression where `url-fetch' would return #t > instead of the file name (as the docstring says it should), which broke > the fiasco script used to find broken hashes of Github's archives[0]. > > Patch to follow. ^ --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-download-Fix-return-value-of-the-url-fetch-procedure.patch >From 61ca016f3a2a6504d899a6ec3b9daaf1647be451 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 27 Jan 2018 12:22:11 -0500 Subject: [PATCH] download: Fix return value of the url-fetch procedure. Fixes #30270 which was introduced by commit 347fa4aebf. * guix/build/download.scm (url-fetch): Return `file' instead of #t upon success. --- guix/build/download.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/download.scm b/guix/build/download.scm index 609a10053..1b630a9d6 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -770,7 +770,7 @@ otherwise simply ignore them." #:reporter (progress-reporter/file (uri-abbreviation uri) size)) (newline))) - #t))) + file))) ((ftp) (false-if-exception* (ftp-fetch uri file #:timeout timeout))) -- 2.16.0 --=-=-=--