From a22854e5406cfc31777a9685eeb66d8d4727d89e Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 13 Dec 2012 12:51:52 +0100
Subject: [PATCH] also list vma backup archives

bump version to 2.3-1
---
 Makefile              | 6 +++---
 PVE/Storage.pm        | 4 ++--
 PVE/Storage/Plugin.pm | 2 +-
 changelog.Debian      | 6 ++++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 3517f35..26d36dc 100644
--- 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 b13df21..17a2377 100755
--- 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 c7c17e1..886117b 100644
--- 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 15bdabb..b143fc4 100644
--- 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.