From: Max Carrara <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v1 pve-manager 5/8] utils: align regex of parse_ceph_version with Perl equivalent
Date: Tue, 30 Apr 2024 17:28:54 +0200 [thread overview]
Message-ID: <20240430152857.659326-6-m.carrara@proxmox.com> (raw)
In-Reply-To: <20240430152857.659326-1-m.carrara@proxmox.com>
Signed-off-by: Max Carrara <m.carrara@proxmox.com>
---
"Unfortunately" JS doesn't support comments in its regexes akin to
Perl's 'x' flag, but oh well ...
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
next prev parent reply other threads:[~2024-04-30 15:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 15:28 [pve-devel] [PATCH v1 pve-manager 0/8] Ceph Build Commit in UI Max Carrara
2024-04-30 15:28 ` [pve-devel] [PATCH v1 pve-manager 1/8] ceph: tools: refactor installation check as guard clause Max Carrara
2024-04-30 15:28 ` [pve-devel] [PATCH v1 pve-manager 2/8] ceph: tools: update Ceph version regex Max Carrara
2024-06-05 14:48 ` Lukas Wagner
2024-04-30 15:28 ` [pve-devel] [PATCH v1 pve-manager 3/8] ceph: services: remove old cluster broadcast Max Carrara
2024-04-30 15:28 ` [pve-devel] [PATCH v1 pve-manager 4/8] ceph: services: refactor version existence check as guard clause Max Carrara
2024-04-30 15:28 ` Max Carrara [this message]
2024-04-30 15:28 ` [pve-devel] [PATCH v1 pve-manager 6/8] ui: ceph: services: parse and display build commit Max Carrara
2024-06-05 14:48 ` Lukas Wagner
2024-06-06 8:04 ` Max Carrara
2024-04-30 15:28 ` [pve-devel] [PATCH v1 pve-manager 7/8] api: ceph: add build commit of host to Ceph osd index endpoint data Max Carrara
2024-04-30 15:28 ` [pve-devel] [PATCH v1 pve-manager 8/8] ui: ceph: osd: rework rendering of version field & show build commit Max Carrara
2024-06-05 14:48 ` Lukas Wagner
2024-06-06 8:04 ` Max Carrara
2024-06-05 9:16 ` [pve-devel] [PATCH v1 pve-manager 0/8] Ceph Build Commit in UI Max Carrara
2024-06-05 14:48 ` Lukas Wagner
2024-06-06 8:06 ` Max Carrara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240430152857.659326-6-m.carrara@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.