also list vma backup archives

bump version to 2.3-1

diff --git a/Makefile b/Makefile
index 3517f353d1f6108dd2357b2daf5bd1e7499def39..26d36dcbb458259e1e5a45bdcb72b6f1e5c5075f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index b13df2169e60ac79cc2c6e168ad6f61f38c87e14..17a2377076d0a60e142e6939cca461af96e5f095 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -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 };
                }

diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index c7c17e12c650e319ab96c3cef2a574317d1974cb..886117b5f51688a97f3af41fe9d9244430229dd0 100644 (file)
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -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);

diff --git a/changelog.Debian b/changelog.Debian
index 15bdabbac7488412efe6880e2f275225d3c8a048..b143fc44925b7ed298c4389cd4020f29b4f4f40a 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -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.