From: Fabian Ebner <f.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] api: apt: adapt to further proxmox-apt back-end changes
Date: Thu, 29 Jul 2021 14:33:36 +0200 [thread overview]
Message-ID: <20210729123336.150435-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210729123336.150435-1-f.ebner@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Dependency bump for proxmox-apt patches #3 and #5 from [0] needed.
[0]: https://lists.proxmox.com/pipermail/pve-devel/2021-July/049554.html
src/api2/node/apt.rs | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs
index ae3dcc72..13b4c80c 100644
--- a/src/api2/node/apt.rs
+++ b/src/api2/node/apt.rs
@@ -447,9 +447,8 @@ pub fn get_repositories() -> Result<Value, Error> {
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(&files, "pbs", &suite);
+ let infos = proxmox_apt::repositories::check_repositories(&files, suite);
+ let standard_repos = proxmox_apt::repositories::standard_repositories(&files, "pbs", suite);
Ok(json!({
"files": files,
@@ -497,7 +496,7 @@ pub fn add_repository(handle: APTRepositoryHandle, digest: Option<String>) -> 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", &suite) {
+ if repo.is_referenced_repository(handle, "pbs", &suite.to_string()) {
if repo.enabled {
return Ok(());
}
@@ -510,8 +509,7 @@ pub fn add_repository(handle: APTRepositoryHandle, digest: Option<String>) -> Re
}
}
- let (repo, path) =
- proxmox_apt::repositories::get_standard_repository(handle, "pbs", &suite);
+ 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
next prev parent reply other threads:[~2021-07-29 12:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-29 12:33 [pbs-devel] [PATCH proxmox-backup 1/2] api: apt: adapt to " Fabian Ebner
2021-07-29 12:33 ` Fabian Ebner [this message]
2021-07-30 8:50 ` [pbs-devel] applied: Re: [PATCH proxmox-backup 2/2] api: apt: adapt to further " Thomas Lamprecht
2021-07-30 8:50 ` [pbs-devel] applied: Re: [PATCH proxmox-backup 1/2] api: apt: adapt to " 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=20210729123336.150435-2-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pbs-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