[pmg-devel] [PATCH pmg-rs 1/2] apt: repos: adapt to back-end changes

[pmg-devel] [PATCH pmg-rs 1/2] apt: repos: adapt to 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/apt/repositories.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/apt/repositories.rs b/src/apt/repositories.rs
index 81552e3..8b09c4f 100644
--- a/src/apt/repositories.rs
+++ b/src/apt/repositories.rs
@@ -44,8 +44,11 @@ mod export {
         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("pmg", &files);
+        let standard_repos =
+            proxmox_apt::repositories::standard_repositories(&files, "pmg", &suite);
 
         Ok(RepositoriesResult {
             files,
@@ -65,6 +68,7 @@ mod export {
         let (mut files, errors, current_digest) = proxmox_apt::repositories::repositories()?;
 
         let handle: APTRepositoryHandle = handle.try_into()?;
+        let suite = proxmox_apt::repositories::get_current_release_codename()?;
 
         if let Some(digest) = digest {
             let expected_digest = proxmox::tools::hex_to_digest(digest)?;
@@ -76,7 +80,7 @@ mod export {
         // 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, "pmg") {
+                if repo.is_referenced_repository(handle, "pmg", &suite) {
                     if repo.enabled {
                         return Ok(());
                     }
@@ -89,7 +93,8 @@ mod export {
             }
         }
 
-        let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle, "pmg")?;
+        let (repo, path) =
+            proxmox_apt::repositories::get_standard_repository(handle, "pmg", &suite);
 
         if let Some(error) = errors.iter().find(|error| error.path == path) {
             bail!(
-- 
2.30.2

[pmg-devel] [PATCH pmg-rs 2/2] apt: repos: adapt to further 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

Can be squashed into the previous patch if all proxmox-apt patches are
applied.

 src/apt/repositories.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/apt/repositories.rs b/src/apt/repositories.rs
index 8b09c4f..7412087 100644
--- a/src/apt/repositories.rs
+++ b/src/apt/repositories.rs
@@ -46,9 +46,8 @@ mod export {
 
         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, "pmg", &suite);
+        let infos = proxmox_apt::repositories::check_repositories(&files, suite);
+        let standard_repos = proxmox_apt::repositories::standard_repositories(&files, "pmg", suite);
 
         Ok(RepositoriesResult {
             files,
@@ -80,7 +79,7 @@ mod export {
         // 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, "pmg", &suite) {
+                if repo.is_referenced_repository(handle, "pmg", &suite.to_string()) {
                     if repo.enabled {
                         return Ok(());
                     }
@@ -93,8 +92,7 @@ mod export {
             }
         }
 
-        let (repo, path) =
-            proxmox_apt::repositories::get_standard_repository(handle, "pmg", &suite);
+        let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle, "pmg", suite);
 
         if let Some(error) = errors.iter().find(|error| error.path == path) {
             bail!(
-- 
2.30.2

[pmg-devel] applied-series: Re: [PATCH pmg-rs 1/2] apt: repos: adapt to back-end changes

[Thomas Lamprecht]

On 29/07/2021 14:38, 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/apt/repositories.rs | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
>

applied both patches, thanks!