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 C476569F37 for ; Thu, 29 Jul 2021 14:26:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A4D3A2EE20 for ; Thu, 29 Jul 2021 14:26:00 +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 B9DC52EE52 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 94C0742C60 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:50 +0200 Message-Id: <20210729122554.148980-4-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.464 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 3/5] check repos: have caller specify the current suite 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:30 -0000 Like that, a potential error is further up the stack, and it's more consistent with what the standard_repository functions do. Signed-off-by: Fabian Ebner --- src/repositories/file.rs | 6 ++---- src/repositories/mod.rs | 7 +++++-- tests/repositories.rs | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/repositories/file.rs b/src/repositories/file.rs index 49cc358..254af4d 100644 --- a/src/repositories/file.rs +++ b/src/repositories/file.rs @@ -5,7 +5,7 @@ use std::path::{Path, PathBuf}; use anyhow::{bail, format_err, Error}; use serde::{Deserialize, Serialize}; -use crate::repositories::release::{get_current_release_codename, DEBIAN_SUITES}; +use crate::repositories::release::DEBIAN_SUITES; use crate::repositories::repository::{ APTRepository, APTRepositoryFileType, APTRepositoryPackageType, }; @@ -300,7 +300,7 @@ impl APTRepositoryFile { /// Checks if old or unstable suites are configured and also that the /// `stable` keyword is not used. - pub fn check_suites(&self) -> Result, Error> { + pub fn check_suites(&self, current_suite: &str) -> Result, Error> { let mut infos = vec![]; for (n, repo) in self.repositories.iter().enumerate() { @@ -318,8 +318,6 @@ impl APTRepositoryFile { }) }; - let current_suite = get_current_release_codename()?; - let current_index = match DEBIAN_SUITES .iter() .position(|&suite| suite == current_suite) diff --git a/src/repositories/mod.rs b/src/repositories/mod.rs index 8637851..8f5500e 100644 --- a/src/repositories/mod.rs +++ b/src/repositories/mod.rs @@ -49,11 +49,14 @@ fn common_digest(files: &[APTRepositoryFile]) -> [u8; 32] { /// `warnings` for bad suites. /// `ignore-pre-upgrade-warning` when the next stable suite is configured. /// `badge` for official URIs. -pub fn check_repositories(files: &[APTRepositoryFile]) -> Result, Error> { +pub fn check_repositories( + files: &[APTRepositoryFile], + current_suite: &str, +) -> Result, Error> { let mut infos = vec![]; for file in files.iter() { - infos.append(&mut file.check_suites()?); + infos.append(&mut file.check_suites(current_suite)?); infos.append(&mut file.check_uris()); } diff --git a/tests/repositories.rs b/tests/repositories.rs index 4cbde60..a9a7b96 100644 --- a/tests/repositories.rs +++ b/tests/repositories.rs @@ -187,7 +187,7 @@ fn test_check_repositories() -> Result<(), Error> { let mut file = APTRepositoryFile::new(&absolute_suite_list)?.unwrap(); file.parse()?; - let infos = check_repositories(&vec![file])?; + let infos = check_repositories(&vec![file], "bullseye")?; assert_eq!(infos.is_empty(), true); let pve_list = read_dir.join("pve.list"); @@ -212,7 +212,7 @@ fn test_check_repositories() -> Result<(), Error> { } expected_infos.sort(); - let mut infos = check_repositories(&vec![file])?; + let mut infos = check_repositories(&vec![file], "bullseye")?; infos.sort(); assert_eq!(infos, expected_infos); @@ -278,7 +278,7 @@ fn test_check_repositories() -> Result<(), Error> { } expected_infos.sort(); - let mut infos = check_repositories(&vec![file])?; + let mut infos = check_repositories(&vec![file], "bullseye")?; infos.sort(); assert_eq!(infos, expected_infos); -- 2.30.2