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 27A756A03B for ; Thu, 29 Jul 2021 14:34:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1CBC02F369 for ; Thu, 29 Jul 2021 14:33:43 +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 EF13D2F355 for ; Thu, 29 Jul 2021 14:33:41 +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 C5E4342C44 for ; Thu, 29 Jul 2021 14:33:41 +0200 (CEST) From: Fabian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 29 Jul 2021 14:33:35 +0200 Message-Id: <20210729123336.150435-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.453 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: [pbs-devel] [PATCH proxmox-backup 1/2] api: apt: adapt to proxmox-apt back-end changes X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jul 2021 12:34:13 -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/api2/node/apt.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index 84d9b79c..ae3dcc72 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -445,8 +445,11 @@ pub fn get_repositories() -> Result { 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("pbs", &files); + let standard_repos = + proxmox_apt::repositories::standard_repositories(&files, "pbs", &suite); Ok(json!({ "files": files, @@ -484,6 +487,8 @@ pub fn get_repositories() -> Result { pub fn add_repository(handle: APTRepositoryHandle, digest: Option) -> Result<(), Error> { let (mut files, errors, current_digest) = proxmox_apt::repositories::repositories()?; + let suite = proxmox_apt::repositories::get_current_release_codename()?; + if let Some(expected_digest) = digest { let current_digest = proxmox::tools::digest_to_hex(¤t_digest); crate::tools::assert_if_modified(&expected_digest, ¤t_digest)?; @@ -492,7 +497,7 @@ pub fn add_repository(handle: APTRepositoryHandle, digest: Option) -> Re // 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, "pbs") { + if repo.is_referenced_repository(handle, "pbs", &suite) { if repo.enabled { return Ok(()); } @@ -505,7 +510,8 @@ pub fn add_repository(handle: APTRepositoryHandle, digest: Option) -> Re } } - let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle, "pbs")?; + let (repo, path) = + proxmox_apt::repositories::get_standard_repository(handle, "pbs", &suite); if let Some(error) = errors.iter().find(|error| error.path == path) { bail!( -- 2.30.2