From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EPkAD67rAGLFfQEAgWs5BA (envelope-from ) for ; Mon, 07 Feb 2022 10:51:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mGqwC67rAGIhdQEAauVa8A (envelope-from ) for ; Mon, 07 Feb 2022 10:51:42 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D9B60432AD for ; Mon, 7 Feb 2022 10:51:41 +0100 (CET) Received: from localhost ([::1]:60012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nH0gM-0005pg-J7 for larch@yhetil.org; Mon, 07 Feb 2022 04:51:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nH00A-00067r-VF for guix-patches@gnu.org; Mon, 07 Feb 2022 04:08:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nH009-0004JZ-TW for guix-patches@gnu.org; Mon, 07 Feb 2022 04:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nH009-0002uj-Ja; Mon, 07 Feb 2022 04:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53818] [PATCH v2 3/7] http-client: 'http-fetch/cached' accepts a string or a . Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: maximedevos@telenet.be, guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 09:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53818 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53818@debbugs.gnu.org Cc: Maxime Devos X-Debbugs-Original-Xcc: Maxime Devos Received: via spool by 53818-submit@debbugs.gnu.org id=B53818.164422483911102 (code B ref 53818); Mon, 07 Feb 2022 09:08:01 +0000 Received: (at 53818) by debbugs.gnu.org; 7 Feb 2022 09:07:19 +0000 Received: from localhost ([127.0.0.1]:40920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzzF-0002sZ-10 for submit@debbugs.gnu.org; Mon, 07 Feb 2022 04:07:19 -0500 Received: from h178-251-242-94.cust.a3fiber.se ([178.251.242.94]:55276 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzzD-0002ri-9A for 53818@debbugs.gnu.org; Mon, 07 Feb 2022 04:07:03 -0500 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yoctocell.xyz; s=mail; t=1644224817; bh=H8jADRyKH0fzq5VeA6Xl0rjl0GKGDAUsZO7ia0nN2ho=; h=From:To:Subject:In-Reply-To:References:Date; b=AkBgueNoH55EJP3JJBosf3/c8DZfwgdKy65vWi4gTiZggYkPOsg6mjsiQWHB9iD2f X4FLDz/u2vIiJXL9fSMK1j8jpIO3Tb3olEICxkBuPxuk7apPFq6W+JMZAT3/xFtSwE P4w2ruk50kgZZKDbiN6YQ61fMBlm7EUHjZ4bdFUc= In-Reply-To: References: Message-Id: <00f4de4c2fddf25566c726dde4a7d52ee80f7f71.1644224421.git.public@yoctocell.xyz> Date: Mon, 07 Feb 2022 10:06:57 +0100 MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644227501; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=H8jADRyKH0fzq5VeA6Xl0rjl0GKGDAUsZO7ia0nN2ho=; b=dVDrIyk5GGLkujG0CfOPPwJHq7f4NIaks6nQ0UhemS/VI7ojy0MFE2M/Nj7hmAh1XnUy+n MELNY/f5AA43mUSFvNrdDPOJpFXwuoHGW8kzqrtjoTEAstsfZZRBUef9P7K04K377Q/Bbt bbLIvLthNmqqZNG9jPrWybah5bZZk9dxiAXi8boFGmkIhrZd6iivRnULfqmHIvSsC2Tnc+ G+cNapr9/7U8ubAZzBSQQ4oL7+KWVnsr20BcLmiBYBSI11Itd9nNB9fbBYpw26IuaZ8vbA E8eUEDQb7t6pNg7kpS4PP8FxSrIzwdtbjCYDFWGgVyfKnSGaNm1+eOhywVZ5vQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644227501; a=rsa-sha256; cv=none; b=PS3M3z/Q4CgpEyaeUurzGzSBXeUdc4cuDAoPMR0LRjym1RakI1NYvJg5EnTo8ZgtZ3tQ86 4Bb6+LmCi4vOuYObr8P5VUkVoZaPAjWQ4CdFTr/Ba4ECq+ZtsMWZg0S4KLweiDyCL51CcW K+XSGMUIOK1Uzoy25huUlGZxBNB2IiYc7HapnAVTUx9/asXjNFUwP6cP8u2ucQXzJm/POa 1JJz8zRpwoKNAuQqi2SiDILs8TkcW/xFDzMeVzNRIxG5SR305lZySn/xLSVAY36pi73kvq JgmExIUP7jqC8fLBSa9pBCcNw9l0tpPittXP0co4jxJ49JYxBm1GTvsL6YRGjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=AkBgueNo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=AkBgueNo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: D9B60432AD X-Spam-Score: -1.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: agIbuJeV+e2b This is consistent with the 'http-fetch' procedure. * guix/http-client.scm (http-fetch/cached): The 'uri' argument can be a string or a record. --- 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 058f09852f..08efdd5e47 100644 --- a/guix/http-client.scm +++ b/guix/http-client.scm @@ -297,7 +297,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 -- 2.34.1