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

also list vma backup archives

Browse Source 
bump version to 2.3-1
This commit is contained in:
Dietmar Maurer
2012-12-13 12:51:52 +01:00
parent 73b6f89b3c
commit a22854e540
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,8 +1,8 @@
RELEASE=2.2
RELEASE=2.3
VERSION=2.0
VERSION=2.3
PACKAGE=libpve-storage-perl
PKGREL=36
PKGREL=1
DESTDIR=
PREFIX=/usr

4
PVE/Storage.pm
View File

@ -298,7 +298,7 @@ sub path_to_volume_id {
} elsif ($path =~ m!^$privatedir/(\d+)$!) {
my $vmid = $1;
return ('rootdir', "$sid:rootdir/$vmid");
} elsif ($path =~ m!^$backupdir/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz))$!) {
} elsif ($path =~ m!^$backupdir/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo))$!) {
my $name = $1;
return ('iso', "$sid:backup/$name");
}
@ -505,7 +505,7 @@ sub template_list {
$info = { volid => "$sid:vztmpl/$1", format => 'tgz' };
} elsif ($tt eq 'backup') {
next if $fn !~ m!/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz))$!;
next if $fn !~ m!/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo))$!;
$info = { volid => "$sid:backup/$1", format => $2 };
}

2
PVE/Storage/Plugin.pm
View File

@ -350,7 +350,7 @@ sub parse_volname {
return ('vztmpl', $1);
} elsif ($volname =~ m!^rootdir/(\d+)$!) {
return ('rootdir', $1, $1);
} elsif ($volname =~ m!^backup/([^/]+(\.(tar|tar\.gz|tar\.lzo|tgz)))$!) {
} elsif ($volname =~ m!^backup/([^/]+(\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo)))$!) {
my $fn = $1;
if ($fn =~ m/^vzdump-(openvz|qemu)-(\d+)-.+/) {
return ('backup', $fn, $2);

6
changelog.Debian
View File

@ -1,3 +1,9 @@
libpve-storage-perl (2.3-1) unstable; urgency=low
* also list vma backup archives
-- Proxmox Support Team <support@proxmox.com> Thu, 13 Dec 2012 07:33:22 +0100
libpve-storage-perl (2.0-36) unstable; urgency=low
* remove timeouts from 'qemu-img snapshot' commands.