yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: get_local_version: allow optional v prefix for version number

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2020-05-22 18:50:06 +02:00
parent 9b0b45d9c3
commit 5c04a0b317
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/CephConfig.pm
View File

@ -258,7 +258,7 @@ sub ceph_remove_keyfile {
my $ceph_version_parser = sub { my $ceph_version_parser = sub {
my $ceph_version = shift; my $ceph_version = shift;
# FIXME this is the same as pve-manager PVE::Ceph::Tools get_local_version # FIXME this is the same as pve-manager PVE::Ceph::Tools get_local_version
if ($ceph_version =~ /^ceph.*\s(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) { if ($ceph_version =~ /^ceph.*\sv?(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) {
my ($version, $buildcommit) = ($1, $2); my ($version, $buildcommit) = ($1, $2);
my $subversions = [ split(/\.|-/, $version) ]; my $subversions = [ split(/\.|-/, $version) ];