From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A495593F02 for ; Wed, 12 Apr 2023 09:18:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 83970D023 for ; Wed, 12 Apr 2023 09:18:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 12 Apr 2023 09:18:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C324F46F2A for ; Wed, 12 Apr 2023 09:18:06 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 12 Apr 2023 09:17:58 +0200 Message-Id: <20230412071758.3383292-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230412071758.3383292-1-f.gruenbichler@proxmox.com> References: <20230412071758.3383292-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.071 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH proxmox-apt 2/2] fix #4653: (In)Release file: improve handling of special suites X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2023 07:18:38 -0000 APT doesn't mind a repository with either "/" or "./" as suite/distribution, such as deb https://example.com/debian ./ in that case, the 'dists' part of the URL and the trailing slash (which would be encoded as '_') is dropped in the file name in '/var/lib/apt/lists/'. Other suite values with a trailing or leading '/' are rejected with an error by APT: E: Malformed entry 1 in sources file /etc/apt/sources.list.d/test.list (absolute Suite Component) E: The list of sources could not be read. so this should be the only special case requiring handling. Signed-off-by: Fabian Grünbichler --- src/repositories/repository.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/repositories/repository.rs b/src/repositories/repository.rs index 7a19af4..ef77186 100644 --- a/src/repositories/repository.rs +++ b/src/repositories/repository.rs @@ -365,12 +365,18 @@ fn release_filename(uri: &str, suite: &str, detached: bool) -> PathBuf { let encoded_uri = uri_to_filename(uri); let filename = if detached { "Release" } else { "InRelease" }; - path.push(format!( - "{}_dists_{}_{}", - encoded_uri, - suite.replace('/', "_"), // e.g. for buster/updates - filename, - )); + if suite == "/" { + path.push(format!("{encoded_uri}_{filename}")); + } else if suite == "./" { + path.push(format!("{encoded_uri}_._{filename}")); + } else { + path.push(format!( + "{}_dists_{}_{}", + encoded_uri, + suite.replace('/', "_"), // e.g. for buster/updates + filename, + )); + } path } -- 2.30.2