From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 689259F73D for ; Fri, 9 Jun 2023 10:45:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C83F2B489 for ; Fri, 9 Jun 2023 10:45:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 9 Jun 2023 10:45:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 63949428FE for ; Fri, 9 Jun 2023 10:45:05 +0200 (CEST) Date: Fri, 9 Jun 2023 10:45:04 +0200 From: Wolfgang Bumiller To: Fiona Ebner Cc: pve-devel@lists.proxmox.com Message-ID: References: <20230605154313.181289-1-f.ebner@proxmox.com> <20230605154313.181289-2-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230605154313.181289-2-f.ebner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.127 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Subject: Re: [pve-devel] [PATCH stable proxmox-apt 1/1] repositories: also detect repository with next suite as configured X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jun 2023 08:45:36 -0000 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 > --- > > 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