public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-rs 2/2] apt: repos: adapt to further back-end changes
Date: Thu, 29 Jul 2021 14:25:54 +0200	[thread overview]
Message-ID: <20210729122554.148980-8-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210729122554.148980-1-f.ebner@proxmox.com>

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

Dependency bump for proxmox-apt patches #3 and #5 needed.

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 22fc4b7..b93719f 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, "pve", &suite);
+        let infos = proxmox_apt::repositories::check_repositories(&files, suite);
+        let standard_repos = proxmox_apt::repositories::standard_repositories(&files, "pve", 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, "pve", &suite) {
+                if repo.is_referenced_repository(handle, "pve", &suite.to_string()) {
                     if repo.enabled {
                         return Ok(());
                     }
@@ -93,8 +92,7 @@ mod export {
             }
         }
 
-        let (repo, path) =
-            proxmox_apt::repositories::get_standard_repository(handle, "pve", &suite);
+        let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle, "pve", suite);
 
         if let Some(error) = errors.iter().find(|error| error.path == path) {
             bail!(
-- 
2.30.2





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

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-29 12:25 [pve-devel] [PATCH-SERIES proxmox-apt/pve-rs] better detection of standard repositories Fabian Ebner
2021-07-29 12:25 ` [pve-devel] [PATCH proxmox-apt 1/5] standard repos: add suite parameter for stricter detection Fabian Ebner
2021-07-29 12:25 ` [pve-devel] [PATCH proxmox-apt 2/5] repo: make suite_variant helper more general Fabian Ebner
2021-07-29 12:25 ` [pve-devel] [PATCH proxmox-apt 3/5] check repos: have caller specify the current suite Fabian Ebner
2021-07-29 12:25 ` [pve-devel] [PATCH proxmox-apt 4/5] repo: remove has_suite_variant helper Fabian Ebner
2021-07-29 12:25 ` [pve-devel] [PATCH proxmox-apt 5/5] add type DebianCodename Fabian Ebner
2021-07-29 12:25 ` [pve-devel] [PATCH pve-rs 1/2] apt: repos: adapt to back-end changes Fabian Ebner
2021-07-29 12:25 ` Fabian Ebner [this message]
2021-07-30  8:47 ` [pve-devel] applied-series: Re: [PATCH-SERIES proxmox-apt/pve-rs] better detection of standard repositories 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=20210729122554.148980-8-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal