From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-rs 1/1] apt: avoid overwriting files that could not be parsed
Date: Thu, 1 Jul 2021 09:54:00 +0200 [thread overview]
Message-ID: <20210701075400.34326-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210701075400.34326-1-f.ebner@proxmox.com>
The enable/disable case should not be reachable via UI as the digest
check comes first, but it's still good to fix it too.
Reported-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
src/apt/repositories.rs | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/apt/repositories.rs b/src/apt/repositories.rs
index 3a421f0..26af67c 100644
--- a/src/apt/repositories.rs
+++ b/src/apt/repositories.rs
@@ -60,7 +60,7 @@ mod export {
/// 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 (mut files, errors, current_digest) = proxmox_apt::repositories::repositories()?;
if let Some(digest) = digest {
let expected_digest = proxmox::tools::hex_to_digest(digest)?;
@@ -72,6 +72,14 @@ mod export {
let (repo, path) =
proxmox_apt::repositories::get_standard_repository(handle.try_into()?, "pve")?;
+ if let Some(error) = errors.iter().find(|error| error.path == path) {
+ bail!(
+ "unable to parse existing file {} - {}",
+ error.path,
+ error.error,
+ );
+ }
+
if let Some(file) = files.iter_mut().find(|file| file.path == path) {
file.repositories.push(repo);
@@ -100,7 +108,7 @@ mod export {
options: ChangeProperties,
digest: Option<&str>,
) -> Result<(), Error> {
- let (mut files, _errors, current_digest) = proxmox_apt::repositories::repositories()?;
+ let (mut files, errors, current_digest) = proxmox_apt::repositories::repositories()?;
if let Some(digest) = digest {
let expected_digest = proxmox::tools::hex_to_digest(digest)?;
@@ -109,6 +117,10 @@ mod export {
}
}
+ if let Some(error) = errors.iter().find(|error| error.path == path) {
+ bail!("unable to parse file {} - {}", error.path, error.error);
+ }
+
if let Some(file) = files.iter_mut().find(|file| file.path == path) {
if let Some(repo) = file.repositories.get_mut(index) {
if let Some(enabled) = options.enabled {
--
2.30.2
next prev parent reply other threads:[~2021-07-01 7:54 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 ` Fabian Ebner [this message]
2021-07-01 9:01 ` [pve-devel] [PATCH pve-rs] apt: check if repository is already configured before adding Fabian Ebner
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=20210701075400.34326-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal