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 1A6701FF2A7 for ; Mon, 1 Jul 2024 16:11:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A65A1371D3; Mon, 1 Jul 2024 16:12:04 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Mon, 1 Jul 2024 16:10:35 +0200 Message-Id: <20240701141040.643701-6-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240701141040.643701-1-m.carrara@proxmox.com> References: <20240701141040.643701-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 v2 pve-manager 05/10] utils: align regex of parse_ceph_version with Perl equivalent 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 Cc: Lukas Wagner 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 Tested-by: Lukas Wagner Reviewed-by: Lukas Wagner --- Changes v1 --> v2: * none www/manager6/Utils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index f5608944..74e46694 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -118,7 +118,8 @@ Ext.define('PVE.Utils', { } if (service.ceph_version) { - var match = service.ceph_version.match(/version (\d+(\.\d+)*)/); + // See PVE/Ceph/Tools.pm - get_local_version + const match = service.ceph_version.match(/^ceph.*\sv?(\d+(?:\.\d+)+)/); if (match) { return match[1]; } -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel