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 E0AF31FF389 for ; Wed, 5 Jun 2024 16:48:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 208EA37623; Wed, 5 Jun 2024 16:49:09 +0200 (CEST) Message-ID: Date: Wed, 5 Jun 2024 16:48:36 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Lukas Wagner To: Proxmox VE development discussion , Max Carrara References: <20240430152857.659326-1-m.carrara@proxmox.com> <20240430152857.659326-3-m.carrara@proxmox.com> Content-Language: de-AT, en-US In-Reply-To: <20240430152857.659326-3-m.carrara@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 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 - Subject: Re: [pve-devel] [PATCH v1 pve-manager 2/8] ceph: tools: update Ceph version regex 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On 2024-04-30 17:28, Max Carrara wrote: > Make the regex more maintainable declaring it as a variable, breaking it > up and commenting it by using the x flag. > > Also remove the part that parses our Debian revision (e.g. -pve1) from > the version, as we do not actually include that in our Ceph builds. > > The part of the regex that parses the build commit hash is made > mandatory (remove '?' after its group). > > Signed-off-by: Max Carrara > --- > PVE/Ceph/Tools.pm | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm > index 087c4ef3..a00d23e1 100644 > --- a/PVE/Ceph/Tools.pm > +++ b/PVE/Ceph/Tools.pm > @@ -68,7 +68,18 @@ sub get_local_version { > > return undef if !defined $ceph_version; > > - if ($ceph_version =~ /^ceph.*\sv?(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) { > + my $re_ceph_version = qr/ > + # Skip ahead to the version, which may optionally start with 'v' > + ^ceph.*\sv? > + > + # Parse the version X.Y, X.Y.Z, etc. > + ( \d+ (?:\.\d+)+ ) \s+ > + > + # Parse the git commit hash between parentheses > + (?: \( ([a-zA-Z0-9]+) \) ) > + /x; TIL about the x modifier! Neat! -- - Lukas _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel