From patchwork Wed May 18 18:10:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 39482 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C163627BBE9; Wed, 18 May 2022 19:14:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D146527BBEA for ; Wed, 18 May 2022 19:14:47 +0100 (BST) Received: from localhost ([::1]:38160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrOC7-0000vP-0Y for patchwork@mira.cbaines.net; Wed, 18 May 2022 14:14:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrOAT-0007mv-QJ for guix-patches@gnu.org; Wed, 18 May 2022 14:13:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrOAT-0005Dz-Fd for guix-patches@gnu.org; Wed, 18 May 2022 14:13:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrOAT-0006ME-Ad for guix-patches@gnu.org; Wed, 18 May 2022 14:13:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55030] [PATCH v2 07/34] http-client: 'http-fetch/cached' converts strings to URIs. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 May 2022 18:13:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55030@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Philip McGrath Received: via spool by 55030-submit@debbugs.gnu.org id=B55030.165289755924257 (code B ref 55030); Wed, 18 May 2022 18:13:05 +0000 Received: (at 55030) by debbugs.gnu.org; 18 May 2022 18:12:39 +0000 Received: from localhost ([127.0.0.1]:33491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrOA2-0006JB-RZ for submit@debbugs.gnu.org; Wed, 18 May 2022 14:12:39 -0400 Received: from mail-ua1-f41.google.com ([209.85.222.41]:34540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrOA2-0006Ij-1a for 55030@debbugs.gnu.org; Wed, 18 May 2022 14:12:38 -0400 Received: by mail-ua1-f41.google.com with SMTP id q1so1140014uao.1 for <55030@debbugs.gnu.org>; Wed, 18 May 2022 11:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZfeijSE0LWaJBksuEnC+RhnW2KB6KzKXEsLYt0MJmF0=; b=FvASC1K39lGerYOyAYQCYlKlH69csu8qA5W65qsPSazL/25yDfY4QtYKca5O/HkC5k g0YYl0eUPSKl3BqKffVSWf2nynf54OkGW3nSszYJDFbAbfDNv4UFAhpmUGnhGaG9/sB5 jx/LGrtlzoJ3c7nB6TAnut6m+KVfUjhqrrRxTwFQapmulrk/KvCy93U1zSqGWm7KDunH ybhb+q7RE5pwHzcve01uQwYzN5HmHa4gCOOQUCbN6l5faiLhORE1Eb7h0JhAbqWMY1Lp 2kVCo2SW+1VX7VyeHOU3tuzNWPceweBFuPnxhosYiwXmQQIr65grQj91VnZI+brHzbqJ WeKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZfeijSE0LWaJBksuEnC+RhnW2KB6KzKXEsLYt0MJmF0=; b=uvvd2V7D74cyKoWgTLTmy4EmaomnOvOdpG+/v0uuacsGMjHDeMMu0O0lxbZswlTroa 9SLECzlnRoE8x4CJjyvt5fkuRh9XzCmXa2rrSxfD7TcWMx1QcjMI/5WXRYhdoCM4jLRn k9pMlFAZOWSv6yZHAvkNu3ViM9eAN2hCtvkEKPB6G5kjEkDtDSpGhauPc7W+KrGhQlCc qsZ/Sa6+/QGzsHOiuiMUsQLHjDg2/ZiY7gNyhrH7bAvZ53w7CkGMAvZm5wJ2BKuPh95D q+hGTTcx50AzNsmDQbp6nMuQ54Jo5gsUIMRw0ywt+ZLYOUKs/fJTM1RCKoBrWpBnAsD1 Sv7g== X-Gm-Message-State: AOAM5324RBNFmZMsog2c7+5PCCnZJfPTq1wdScrnLK56ZbvHws0lRSwq /8baDbQ4aOcdHNuuxJHaSpdo+PMZ+Q73wb2o X-Google-Smtp-Source: ABdhPJyA1sddKAlQbIFMXdtfIuVo9hI8Id4TtEWFItKC9FtTK0S4N/I5dGTmyDibvmsWN9ozumQ4QA== X-Received: by 2002:ab0:154f:0:b0:368:b7ad:1729 with SMTP id p15-20020ab0154f000000b00368b7ad1729mr590862uae.8.1652897552541; Wed, 18 May 2022 11:12:32 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id e2-20020a1fe702000000b00356d920da1csm267172vkh.2.2022.05.18.11.12.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 May 2022 11:12:32 -0700 (PDT) From: Philip McGrath Date: Wed, 18 May 2022 14:10:54 -0400 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: <20220419232736.272970-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/http-client.scm (http-fetch/cached): Use 'string->uri' if URI is a string, as with 'http-fetch'. --- guix/http-client.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/http-client.scm b/guix/http-client.scm index 699f5dfd57..9138a627ac 100644 --- a/guix/http-client.scm +++ b/guix/http-client.scm @@ -314,7 +314,10 @@ (define* (http-fetch/cached uri #:key (ttl (%http-cache-ttl)) text? TIMEOUT specifies the timeout in seconds for connection establishment. Write information about redirects to LOG-PORT." - (let ((file (cache-file-for-uri uri))) + (let* ((uri (if (string? uri) + (string->uri uri) + uri)) + (file (cache-file-for-uri uri))) (define (update-cache cache-port) (define cache-time (and cache-port