From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-rs] apt: check if repository is already configured before adding
Date: Thu, 1 Jul 2021 11:01:40 +0200 [thread overview]
Message-ID: <20210701090140.68059-1-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210701075400.34326-1-f.ebner@proxmox.com>
and if it is, enable it.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
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
next prev parent reply other threads:[~2021-07-01 9:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-01 7:53 [pve-devel] [PATCH-SERIES proxmox-widget-toolkit/pve-rs] Two more APT repo fixes Fabian Ebner
2021-07-01 7:53 ` [pve-devel] [PATCH proxmox-widget-toolkit 1/1] apt repos: use correct URL Fabian Ebner
2021-07-01 7:54 ` [pve-devel] [PATCH pve-rs 1/1] apt: avoid overwriting files that could not be parsed Fabian Ebner
2021-07-01 9:01 ` Fabian Ebner [this message]
2021-07-02 11:03 ` [pve-devel] applied-series: [PATCH-SERIES proxmox-widget-toolkit/pve-rs] Two more APT repo fixes Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210701090140.68059-1-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox