[pbs-devel] [PATCH proxmox-backup 2/2] api: apt: adapt to further proxmox-apt back-end changes

[Fabian Ebner]

Signed-off-by: Fabian Ebner <f.ebner at 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