From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 82E1F1FF184 for ; Thu, 20 Nov 2025 16:04:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B56E3C162; Thu, 20 Nov 2025 16:04:08 +0100 (CET) Mime-Version: 1.0 Date: Thu, 20 Nov 2025 16:04:05 +0100 Message-Id: To: "Stefan Hanreich" X-Mailer: aerc 0.20.0 References: <20251120145031.550340-1-s.hanreich@proxmox.com> <20251120145031.550340-2-s.hanreich@proxmox.com> In-Reply-To: <20251120145031.550340-2-s.hanreich@proxmox.com> From: "Shannon Sterz" X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763651014363 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.072 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox 1/5] proxmox-upgrade-checks: fix meta package version check X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Cc: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On Thu Nov 20, 2025 at 3:50 PM CET, Stefan Hanreich wrote: > old_version was changed to be an Option in proxmox-apt-api-types, > so handle that here as well. > > Signed-off-by: Stefan Hanreich > --- > Not 100% sure about how to handle the case of a missing old_version. > Could you please take a look @Shannon? > > proxmox-upgrade-checks/src/lib.rs | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/proxmox-upgrade-checks/src/lib.rs b/proxmox-upgrade-checks/src/lib.rs > index 4f76555a..207af04b 100644 > --- a/proxmox-upgrade-checks/src/lib.rs > +++ b/proxmox-upgrade-checks/src/lib.rs > @@ -204,7 +204,13 @@ impl UpgradeChecker { > > if let Some(meta_pkg) = meta_pkg { > let pkg_version = Regex::new(r"^(\d+)\.(\d+)[.-](\d+)")?; > - let captures = pkg_version.captures(&meta_pkg.old_version); > + > + let captures = meta_pkg > + .old_version > + .as_ref() > + .map(|old_version| pkg_version.captures(old_version)) > + .flatten(); > + > if let Some(captures) = captures { > let maj = Self::extract_version_from_captures(1, &captures)?; > let min = Self::extract_version_from_captures(2, &captures)?; ah thanks for catching this, i somehow missed this, i'll need to ping my series finally switching pdm over to this crate again. anyhow, for now this is fine, though i would appreciate this approach a bit more: ``` if let Some(old_version) = meta_pkg.and_then(|m| m.old_version.as_ref()) { let pkg_version = Regex::new(r"^(\d+)\.(\d+)[.-](\d+)")?; let captures = pkg_version.captures(old_version); ``` there isn't really anything we can do if we don't have information on the previous package information. if you do want to stick with your approach i'd suggest switching to this: ``` let captures = meta_pkg .old_version .as_ref() .and_then(|v| pkg_version.captures(v)); ``` _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel