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 BB6C0722C8 for ; Thu, 1 Jul 2021 11:02:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A584F2295A for ; Thu, 1 Jul 2021 11:01:46 +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 E350A22950 for ; Thu, 1 Jul 2021 11:01:44 +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 AA5B54285E for ; Thu, 1 Jul 2021 11:01:44 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 1 Jul 2021 11:01:40 +0200 Message-Id: <20210701090140.68059-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210701075400.34326-1-f.ebner@proxmox.com> References: <20210701075400.34326-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.606 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 pve-rs] apt: check if repository is already configured before adding 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, 01 Jul 2021 09:02:16 -0000 and if it is, enable it. Signed-off-by: Fabian Ebner --- src/apt/repositories.rs | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/apt/repositories.rs b/src/apt/repositories.rs index 26af67c..79c2334 100644 --- a/src/apt/repositories.rs +++ b/src/apt/repositories.rs @@ -6,7 +6,8 @@ mod export { use serde::{Deserialize, Serialize}; use proxmox_apt::repositories::{ - APTRepositoryFile, APTRepositoryFileError, APTRepositoryInfo, APTStandardRepository, + APTRepositoryFile, APTRepositoryFileError, APTRepositoryHandle, APTRepositoryInfo, + APTStandardRepository, }; #[derive(Deserialize, Serialize)] @@ -56,12 +57,15 @@ mod export { } /// Add the repository identified by the `handle`. + /// If the repository is already configured, it will be set to enabled. /// /// The `digest` parameter asserts that the configuration has not been modified. #[export] pub fn add_repository(handle: &str, digest: Option<&str>) -> Result<(), Error> { let (mut files, errors, current_digest) = proxmox_apt::repositories::repositories()?; + let handle: APTRepositoryHandle = handle.try_into()?; + if let Some(digest) = digest { let expected_digest = proxmox::tools::hex_to_digest(digest)?; if expected_digest != current_digest { @@ -69,8 +73,23 @@ mod export { } } - let (repo, path) = - proxmox_apt::repositories::get_standard_repository(handle.try_into()?, "pve")?; + // 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, "pve") { + if repo.enabled { + return Ok(()); + } + + repo.set_enabled(true); + file.write()?; + + return Ok(()); + } + } + } + + let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle, "pve")?; if let Some(error) = errors.iter().find(|error| error.path == path) { bail!( -- 2.30.2