From patchwork Wed Oct 27 13:53:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 34113 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 CA86227BBE3; Wed, 27 Oct 2021 16:06:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1EDC327BBE1 for ; Wed, 27 Oct 2021 16:06:56 +0100 (BST) Received: from localhost ([::1]:59160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfkVz-0007Aa-8Q for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 11:06:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfjet-0008OZ-1r for guix-patches@gnu.org; Wed, 27 Oct 2021 10:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfjes-0003Bc-GC for guix-patches@gnu.org; Wed, 27 Oct 2021 10:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfjes-0002nF-CH for guix-patches@gnu.org; Wed, 27 Oct 2021 10:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51441] [PATCH] substitutes: keep base's uri-path for Properly construct URL. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 14:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51441 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51441@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163534388610685 (code B ref -1); Wed, 27 Oct 2021 14:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Oct 2021 14:11:26 +0000 Received: from localhost ([127.0.0.1]:50104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfjeD-0002m9-E3 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 10:11:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:50372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1mfje8-0002lw-Ut for submit@debbugs.gnu.org; Wed, 27 Oct 2021 10:11:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1mfje8-00072U-0u for guix-patches@gnu.org; Wed, 27 Oct 2021 10:11:16 -0400 Received: from out203-205-221-242.mail.qq.com ([203.205.221.242]:48986) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1mfjdz-0002Kh-P4 for guix-patches@gnu.org; Wed, 27 Oct 2021 10:11:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1635343850; bh=RkYVFctcq0KPd2wBmWZMLv0+GtcPHKjkwGGGI7viLA0=; h=From:To:Subject:Date; b=rVZBLgOMGknT3Fl48rG89fXhzga0SN52YXIJN4df9FTvrxLSsd02Nu9T0T9y6NK68 BY20pkzv66bDfvbQrCoqbEW/LJGubcoRt9TnZIZgAknmWdvcLTnR2ZoRIWJR9CBG/y wZaVbURaSliuANL8nj+G9PDlwB3wHsjVlFXp+g/0= Received: from asus ([2409:8928:124e:600:171f:1b40:5859:701f]) by newxmesmtplogicsvrsza7.qq.com (NewEsmtp) with SMTP id 2B081EC6; Wed, 27 Oct 2021 22:10:48 +0800 X-QQ-mid: xmsmtpt1635343848t610a92ji Message-ID: X-QQ-XMAILINFO: OQlRUX9+U3rMCUuAv0MznkBLdvQw349ygDWLvQ03SKs5054LSeK47fh33NbUSn pJtG6xUay1B2X8uOFNDWXKYVcmrSleoczwFsopnF0+TcrCmDjg3Cl4HebEBp1WS5mK//xthg7MSH 69E7ba09z8MBezJj9QvmFjaA8j+LHSx/MlnWmd5s/tZp2oOZ2ePWd1LPP6naMxz0H0VnliVD0mJo jfJdVdYE009KLCkrY5AsQFvC2kW9DlJCJjEr/5cOOEzNaeT7h0EfjsjE2GTynb7HjWw5g3i0OpeR dh010gs8KKYQB2VnkYMiq5lwKfJW95/1waJU15PhsIPtkSbzqgeGjuFPmrfPysySLtdgA8nMWWPC rGf9BYKpklw5H9/MPSVtVVL7zQd9+dt91G7LoPs+gy5KBA6fUeKrgyfK6ONfNuKk2tATK6Ww3LTB wFLtLYBK+1+aIeCyuOEArLVpfxNjy6Ucc0jgX55FUNOZkE714xdmydAYDN4B6xg48BZWC3T0CeoV XU7C5IOx2VvneKQ/oHfqs21+Ksc/k6fSj3HepCVhawT6ouZv0w7qDmyRlfxfSDTT25WpHY5inXlU biV5QE4nG4MXWCgpDZPPj9t+5CauzwoRC2gpQa7Iis+tJxQxKDP8MENzuEWz6SmfNf0lNXLAJn1r a/UN0PGl4DwNo/YHnTXLc5nmmwHuTxFiws/BJfZkfTVTV8y3BuGGH/7AMvG+dYojW8qWVVnWDW6L ptbip4emdWQ2WCd3vm4UKDaFgv6hT+0YXcdg3jbZtRGPz1tiI0RO5tcqfVLC7I8NguWOKOGZ246d Y= User-agent: mu4e 1.6.6; emacs 28.0.50 Date: Wed, 27 Oct 2021 21:53:55 +0800 X-OQ-MSGID: <87r1c6wobb.fsf@qq.com> MIME-Version: 1.0 Received-SPF: pass client-ip=203.205.221.242; envelope-from=873216071@qq.com; helo=out203-205-221-242.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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" Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> X-getmail-retrieved-from-mailbox: Patches Hello, Sorry for my english, and i'm not sure ChangeLog is right. https://mirror.sjtu.edu.cn/guix use customize script to mirror official substitutes server, at /guix not in / . narinfo-request will forget add /guix to url, so i can't use substitutes from them, this patch fix it. From 7fe17965d5336d55ec8b1b7471cbbb34b12e9a0b Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Wed, 27 Oct 2021 21:28:24 +0800 Subject: [PATCH] substitutes: keep base's uri-path for Properly construct URL. substitutes (narinfo-request): keep BASE's uri-path for properly construct url. some substitutes server don't use guix publish, them use customize scripts to mirror official server, if them look likes https://example.com/guix , narinfo-request will lost /guix . --- guix/substitutes.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/substitutes.scm b/guix/substitutes.scm index a5c554acff..bfbd29623e 100644 --- a/guix/substitutes.scm +++ b/guix/substitutes.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Nikita Karetnikov ;;; Copyright © 2018 Kyle Meyer ;;; Copyright © 2020 Christopher Baines +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -158,7 +159,8 @@ (define (narinfo-request cache-url path) "Return an HTTP request for the narinfo of PATH at CACHE-URL." (let* ((base (string->uri cache-url)) (ref (build-relative-ref - #:path (string-append (store-path-hash-part path) ".narinfo"))) + #:path (string-append (uri-path base) "/" + (store-path-hash-part path) ".narinfo"))) (url (resolve-uri-reference ref base)) (headers '((User-Agent . "GNU Guile")))) (build-request url #:method 'GET #:headers headers))) -- 2.33.1