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 7117C6A07A for ; Thu, 29 Jul 2021 14:38:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6E4CE2F4FA for ; Thu, 29 Jul 2021 14:38:18 +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 id B650A2F4E8 for ; Thu, 29 Jul 2021 14:38:14 +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 89ED242C5D for ; Thu, 29 Jul 2021 14:38:14 +0200 (CEST) From: Fabian Ebner To: pmg-devel@lists.proxmox.com Date: Thu, 29 Jul 2021 14:38:10 +0200 Message-Id: <20210729123810.151246-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210729123810.151246-1-f.ebner@proxmox.com> References: <20210729123810.151246-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.452 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: [pmg-devel] [PATCH pmg-rs 2/2] apt: repos: adapt to further back-end changes X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jul 2021 12:38:48 -0000 Signed-off-by: Fabian Ebner --- Dependency bump for proxmox-apt patches #3 and #5 from [0] needed. [0]: https://lists.proxmox.com/pipermail/pve-devel/2021-July/049554.html Can be squashed into the previous patch if all proxmox-apt patches are applied. src/apt/repositories.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/apt/repositories.rs b/src/apt/repositories.rs index 8b09c4f..7412087 100644 --- a/src/apt/repositories.rs +++ b/src/apt/repositories.rs @@ -46,9 +46,8 @@ mod export { let suite = proxmox_apt::repositories::get_current_release_codename()?; - let infos = proxmox_apt::repositories::check_repositories(&files)?; - let standard_repos = - proxmox_apt::repositories::standard_repositories(&files, "pmg", &suite); + let infos = proxmox_apt::repositories::check_repositories(&files, suite); + let standard_repos = proxmox_apt::repositories::standard_repositories(&files, "pmg", suite); Ok(RepositoriesResult { files, @@ -80,7 +79,7 @@ mod export { // check if it's already configured first for file in files.iter_mut() { for repo in file.repositories.iter_mut() { - if repo.is_referenced_repository(handle, "pmg", &suite) { + if repo.is_referenced_repository(handle, "pmg", &suite.to_string()) { if repo.enabled { return Ok(()); } @@ -93,8 +92,7 @@ mod export { } } - let (repo, path) = - proxmox_apt::repositories::get_standard_repository(handle, "pmg", &suite); + let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle, "pmg", suite); if let Some(error) = errors.iter().find(|error| error.path == path) { bail!( -- 2.30.2