From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yAU+K/YO6GAsGwEAgWs5BA (envelope-from ) for ; Fri, 09 Jul 2021 10:55:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4AzsJvYO6GCAZQAA1q6Kng (envelope-from ) for ; Fri, 09 Jul 2021 08:55:18 +0000 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 CDCA11F06C for ; Fri, 9 Jul 2021 10:55:17 +0200 (CEST) Received: from localhost ([::1]:32934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1m2W-0000If-1g for larch@yhetil.org; Fri, 09 Jul 2021 04:39:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1m2J-0000HI-PC for bug-guix@gnu.org; Fri, 09 Jul 2021 04:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1m2J-0005uC-I1 for bug-guix@gnu.org; Fri, 09 Jul 2021 04:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m1m2J-0000hW-Gd for bug-guix@gnu.org; Fri, 09 Jul 2021 04:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#44906: [PATCH 0/3] Properly construct URLs if base-url has trailing slash Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 09 Jul 2021 08:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44906 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 44906@debbugs.gnu.org, Mark H Weaver , zimoun , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 44906-submit@debbugs.gnu.org id=B44906.16258199302586 (code B ref 44906); Fri, 09 Jul 2021 08:39:03 +0000 Received: (at 44906) by debbugs.gnu.org; 9 Jul 2021 08:38:50 +0000 Received: from localhost ([127.0.0.1]:58309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1m26-0000fd-LB for submit@debbugs.gnu.org; Fri, 09 Jul 2021 04:38:50 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:57425) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1m23-0000fM-5n for 44906@debbugs.gnu.org; Fri, 09 Jul 2021 04:38:49 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4GLmln62Xyz1qtds; Fri, 9 Jul 2021 10:38:45 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4GLmln4Fh8z1qr4T; Fri, 9 Jul 2021 10:38:45 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 2YGhrtEX1Sal; Fri, 9 Jul 2021 10:38:42 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-58-132.dynamic.mnet-online.de [188.174.58.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Fri, 9 Jul 2021 10:38:42 +0200 (CEST) Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id E5ABF601A5; Fri, 9 Jul 2021 10:38:43 +0200 (CEST) From: Hartmut Goebel Date: Fri, 9 Jul 2021 10:38:38 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: <87zh2udx4j.fsf@netris.org> References: <3848e5d4-3694-e7f4-cb42-f97a51bde5b4@crazy-compilers.com> <86a6v2qslp.fsf@gmail.com> <7b367712-d759-ba3d-3ffc-d3323cb859c7@crazy-compilers.com> <87im9iddta.fsf@gnu.org> <87zh2udx4j.fsf@netris.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625820918; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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; bh=S2dCqUeZ6/fFcnT9BC32h09MtfNQz7xbEymCInOMKdM=; b=DSW6Wx3XlHYqaDvi/cP0e4VlL4omyHWfBatIPPypFA5GzuHSvlLu0brWgXO//zYBVoMxwP 2/P+hsHzrEVAiAO1BiRLTO5WnBI8N9lsf7DhZziLpog3G9EcqhX7CxsHXt7QPy2GmjIB5U d4Zlxitil6iIDjmB5NdbESdO6kj0F1P4zAblSCTeaAGAii+6tRLWouzbsJY26rF7ws5byS avwqKrsgH7wGzxRVxOpVMK8xSXVSHmPWZrjg1ShA6GCMkhP1myffujgT+P67LorP3dRtDS piLVNE6Iu4J2WU61PsYFUgnzNWyz4piZekucwSrI/3hh6aXW0m1geLDmtepUjA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625820918; a=rsa-sha256; cv=none; b=Ekdz/bRUVUZDqER7mTjHA3+1nmziX9crlDBp86MisV3Wwij4dtPt6gF1efOgeWdM8BMjpP xaMgykd+HuTyi5G9FoYzfkT3QPk6rFQHGdFiRjeIQXjBD+MaAeI792vrUJmov6Nc+5D5Tw +c7p6cVEKyx/QjoAx/4LaiYxR9Y0Yv4/kP9Su8aIGVHeLcbvG6XuG3E8nlXKiEDS7EOz/M 3AIrKDbicD/s6bLmLweMdJGywQ4wzJ1u0LO9iJi5HpsJov7dCgPrLkZAO7xcuPFS4LJ3j/ BYraD8cGaJsSav2ZzSMsW8sjTudx77LXo0vW+OxdtIooo+pg3bAFXjItSyiKdw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: 4.10 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: CDCA11F06C X-Spam-Score: 4.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: psZ1Eidf6fEZ Here is now an attempt to solve the issue. It had to be fixed in guix/substitutes.scm and guix/ci.scm only. In guix/scripts/publish.scm I did not spot any place where wrong URLs are constructed. Many thanks to Mark for pointing to 'resolve-uri-reference'. Regarding CI: I did some tests, so these should work. Anyhow, I did not find a tests-suite for fully testing this part. Hartmut Goebel (3): substitute: Fix handling of short option "-h". substitutes: Properly construct URLs. ci: Properly construct URLs. guix/ci.scm | 79 +++++++++++++++++++++---------------- guix/scripts/substitute.scm | 2 +- guix/substitutes.scm | 13 +++--- 3 files changed, 55 insertions(+), 39 deletions(-) -- 2.30.2