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 9504E6A09A for ; Thu, 29 Jul 2021 14:38:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8AFEB2F4FB 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 CBAFC2F4F1 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 A3ECF42C5C 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:09 +0200 Message-Id: <20210729123810.151246-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.451 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 1/2] apt: repos: adapt to 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:18 -0000 It's up to the caller to provide the current release for standard repository detection/addition. Signed-off-by: Fabian Ebner --- Dependency bump for proxmox-apt patch #1 from [0] needed. [0]: https://lists.proxmox.com/pipermail/pve-devel/2021-July/049554.html src/apt/repositories.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/apt/repositories.rs b/src/apt/repositories.rs index 81552e3..8b09c4f 100644 --- a/src/apt/repositories.rs +++ b/src/apt/repositories.rs @@ -44,8 +44,11 @@ mod export { let (files, errors, digest) = proxmox_apt::repositories::repositories()?; let digest = proxmox::tools::digest_to_hex(&digest); + 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("pmg", &files); + let standard_repos = + proxmox_apt::repositories::standard_repositories(&files, "pmg", &suite); Ok(RepositoriesResult { files, @@ -65,6 +68,7 @@ mod export { let (mut files, errors, current_digest) = proxmox_apt::repositories::repositories()?; let handle: APTRepositoryHandle = handle.try_into()?; + let suite = proxmox_apt::repositories::get_current_release_codename()?; if let Some(digest) = digest { let expected_digest = proxmox::tools::hex_to_digest(digest)?; @@ -76,7 +80,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") { + if repo.is_referenced_repository(handle, "pmg", &suite) { if repo.enabled { return Ok(()); } @@ -89,7 +93,8 @@ mod export { } } - let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle, "pmg")?; + 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