all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-rs 2/2] apt: repos: adapt to further back-end changes
Date: Thu, 29 Jul 2021 14:38:10 +0200	[thread overview]
Message-ID: <20210729123810.151246-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210729123810.151246-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

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





  reply	other threads:[~2021-07-29 12:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-29 12:38 [pmg-devel] [PATCH pmg-rs 1/2] apt: repos: adapt to " Fabian Ebner
2021-07-29 12:38 ` Fabian Ebner [this message]
2021-07-30  8:47 ` [pmg-devel] applied-series: " 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=20210729123810.151246-2-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pmg-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