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 DB75320EC91 for ; Tue, 30 Apr 2024 17:28:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C05323EE; Tue, 30 Apr 2024 17:29:09 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Tue, 30 Apr 2024 17:28:50 +0200 Message-Id: <20240430152857.659326-2-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240430152857.659326-1-m.carrara@proxmox.com> References: <20240430152857.659326-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 Subject: [pve-devel] [PATCH v1 pve-manager 1/8] ceph: tools: refactor installation check as guard clause 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" Signed-off-by: Max Carrara --- PVE/Ceph/Tools.pm | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm index 9b97171e..087c4ef3 100644 --- a/PVE/Ceph/Tools.pm +++ b/PVE/Ceph/Tools.pm @@ -57,24 +57,25 @@ my $config_files = { sub get_local_version { my ($noerr) = @_; - if (check_ceph_installed('ceph_bin', $noerr)) { - my $ceph_version; - run_command( - [ $ceph_service->{ceph_bin}, '--version' ], - noerr => $noerr, - outfunc => sub { $ceph_version = shift if !defined $ceph_version }, - ); - return undef if !defined $ceph_version; - - if ($ceph_version =~ /^ceph.*\sv?(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) { - my ($version, $buildcommit) = ($1, $2); - my $subversions = [ split(/\.|-/, $version) ]; - - # return (version, buildid, major, minor, ...) : major; - return wantarray - ? ($version, $buildcommit, $subversions) - : $subversions->[0]; - } + return undef if !check_ceph_installed('ceph_bin', $noerr); + + my $ceph_version; + run_command( + [ $ceph_service->{ceph_bin}, '--version' ], + noerr => $noerr, + outfunc => sub { $ceph_version = shift if !defined $ceph_version }, + ); + + return undef if !defined $ceph_version; + + if ($ceph_version =~ /^ceph.*\sv?(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) { + my ($version, $buildcommit) = ($1, $2); + my $subversions = [ split(/\.|-/, $version) ]; + + # return (version, buildid, major, minor, ...) : major; + return wantarray + ? ($version, $buildcommit, $subversions) + : $subversions->[0]; } return undef; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel