public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Fiona Ebner <f.ebner@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH stable proxmox-apt 1/1] repositories: also detect repository with next suite as configured
Date: Fri, 9 Jun 2023 10:45:04 +0200	[thread overview]
Message-ID: <gvum32qwasezek7wjvxljjbqjf32odx7al6r3erwwq73xt5prj@hl5r5jerffvl> (raw)
In-Reply-To: <20230605154313.181289-2-f.ebner@proxmox.com>

FYI, wrong git repo, should be done in proxmox.git

Is this purely for stable-only?

On Mon, Jun 05, 2023 at 05:43:08PM +0200, Fiona Ebner wrote:
> This avoids that no standard Proxmox repository can be detected during
> upgrade anymore. There is a 'ignore-pre-upgrade-warning' about the
> suite already, that the frontend can display when upgrading is not
> allowed yet.
> 
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> 
> It's not ideal, for the time between when the update for proxmox-apt
> is rolled out and when the Bookworm repositories are actually made
> available. And it would need to be done for each major upgrade.
> 
> For next time, I'll try to come up with something better. Probably,
> the callers should let the backend here know when upgrade is allowed
> and then the backend can act accordingly.
> 
>  src/repositories/mod.rs | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/src/repositories/mod.rs b/src/repositories/mod.rs
> index d8848b8..6588b90 100644
> --- a/src/repositories/mod.rs
> +++ b/src/repositories/mod.rs
> @@ -106,7 +106,12 @@ pub fn standard_repositories(
>                      continue;
>                  }
>  
> -                if repo.is_referenced_repository(entry.handle, product, &suite.to_string()) {
> +                if repo.is_referenced_repository(entry.handle, product, &suite.to_string())
> +                    || repo.is_referenced_repository(
> +                        entry.handle,
> +                        product,
> +                        &suite.next().unwrap().to_string(),
> +                ) {
>                      entry.status = Some(repo.enabled);
>                  }
>              }
> -- 
> 2.30.2




  reply	other threads:[~2023-06-09  8:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-05 15:43 [pve-devel] [PATCH-SERIES proxmox-apt/widget-toolkit] prepare for major upgrade Fiona Ebner
2023-06-05 15:43 ` [pve-devel] [PATCH stable proxmox-apt 1/1] repositories: also detect repository with next suite as configured Fiona Ebner
2023-06-09  8:45   ` Wolfgang Bumiller [this message]
2023-06-09  8:49     ` Fiona Ebner
2023-06-09  9:59       ` [pve-devel] applied: " Wolfgang Bumiller
2023-06-05 15:43 ` [pve-devel] [PATCH widget-toolkit 1/5] apt repositories: actually ignore ignore-pre-upgrade-warning Fiona Ebner
2023-06-05 15:43 ` [pve-devel] [PATCH/RFC widget-toolkit 2/5] apt repositories: just ignore unknown info rather than throwing an error Fiona Ebner
2023-06-05 17:06   ` Thomas Lamprecht
2023-06-06  6:27     ` Fiona Ebner
2023-06-05 15:43 ` [pve-devel] [PATCH widget-toolkit 3/5] apt repositories: add classifyOrigin helper Fiona Ebner
2023-06-05 15:43 ` [pve-devel] [PATCH widget-toolkit 4/5] apt repositories: detect mixed suites before major upgrade Fiona Ebner
2023-06-05 15:43 ` [pve-devel] [PATCH stable-bullseye widget-toolkit 5/5] apt repositoires: allow " Fiona Ebner
2023-06-07 15:23 ` [pve-devel] applied-series: [PATCH-SERIES proxmox-apt/widget-toolkit] prepare for " 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=gvum32qwasezek7wjvxljjbqjf32odx7al6r3erwwq73xt5prj@hl5r5jerffvl \
    --to=w.bumiller@proxmox.com \
    --cc=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