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 CA34669F2A for ; Thu, 29 Jul 2021 14:26:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9188E2EE79 for ; Thu, 29 Jul 2021 14:25:59 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 79FE12EE48 for ; Thu, 29 Jul 2021 14:25:58 +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 49CE642C60 for ; Thu, 29 Jul 2021 14:25:58 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 29 Jul 2021 14:25:49 +0200 Message-Id: <20210729122554.148980-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210729122554.148980-1-f.ebner@proxmox.com> References: <20210729122554.148980-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.465 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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/5] repo: make suite_variant helper more general 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: Thu, 29 Jul 2021 12:26:29 -0000 use the first appearance of '-' or '/' to detect the variant instead of keeping a list of possible variants, which would need to include things like "-proposed-updates-debug". Signed-off-by: Fabian Ebner --- src/repositories/repository.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/repositories/repository.rs b/src/repositories/repository.rs index fc16327..d85f063 100644 --- a/src/repositories/repository.rs +++ b/src/repositories/repository.rs @@ -433,16 +433,12 @@ fn host_from_uri(uri: &str) -> Option<&str> { } /// Splits the suite into its base part and variant. +/// Does not expect the base part to contain either `-` or `/`. fn suite_variant(suite: &str) -> (&str, &str) { - let variants = ["-backports-sloppy", "-backports", "-updates", "/updates"]; - - for variant in variants.iter() { - if let Some(base) = suite.strip_suffix(variant) { - return (base, variant); - } + match suite.find(&['-', '/'][..]) { + Some(n) => (&suite[0..n], &suite[n..]), + None => (suite, ""), } - - (suite, "") } /// Strips existing double quotes from the string first, and then adds double quotes at -- 2.30.2