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

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

[Fabian Ebner]

It's up to the caller to provide the current release for standard
repository detection/addition.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

Dependency bump for proxmox-apt patch #1 from [0] needed.

[0]: https://lists.proxmox.com/pipermail/pve-devel/2021-July/049554.html

 src/api2/node/apt.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs
index 84d9b79c..ae3dcc72 100644
--- a/src/api2/node/apt.rs
+++ b/src/api2/node/apt.rs
@@ -445,8 +445,11 @@ pub fn get_repositories() -> Result<Value, Error> {
     let (files, errors, digest) = proxmox_apt::repositories::repositories()?;
     let digest = proxmox::tools::digest_to_hex(&digest);
 
+    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("pbs", &files);
+    let standard_repos =
+        proxmox_apt::repositories::standard_repositories(&files, "pbs", &suite);
 
     Ok(json!({
         "files": files,
@@ -484,6 +487,8 @@ pub fn get_repositories() -> Result<Value, Error> {
 pub fn add_repository(handle: APTRepositoryHandle, digest: Option<String>) -> Result<(), Error> {
     let (mut files, errors, current_digest) = proxmox_apt::repositories::repositories()?;
 
+    let suite = proxmox_apt::repositories::get_current_release_codename()?;
+
     if let Some(expected_digest) = digest {
         let current_digest = proxmox::tools::digest_to_hex(&current_digest);
         crate::tools::assert_if_modified(&expected_digest, &current_digest)?;
@@ -492,7 +497,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") {
+            if repo.is_referenced_repository(handle, "pbs", &suite) {
                 if repo.enabled {
                     return Ok(());
                 }
@@ -505,7 +510,8 @@ pub fn add_repository(handle: APTRepositoryHandle, digest: Option<String>) -> Re
         }
     }
 
-    let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle, "pbs")?;
+    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

[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@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

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

[Thomas Lamprecht]

On 29/07/2021 14:33, Fabian Ebner wrote:
> It's up to the caller to provide the current release for standard
> repository detection/addition.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> 
> Dependency bump for proxmox-apt patch #1 from [0] needed.
> 
> [0]: https://lists.proxmox.com/pipermail/pve-devel/2021-July/049554.html
> 
>  src/api2/node/apt.rs | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
>

applied, thanks!

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

[Thomas Lamprecht]

On 29/07/2021 14:33, Fabian Ebner wrote:
> 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(-)
> 
>

applied, thanks!