fix vzdump --exclude-path

diff --git a/PVE/API2/VZDump.pm b/PVE/API2/VZDump.pm
index 935e2e97ba3e2dec5164aa03dbc9268e7698e028..dc0836b1200bb79d87b45934674e2ad8f8561aa9 100644 (file)
--- a/PVE/API2/VZDump.pm
+++ b/PVE/API2/VZDump.pm
@@ -92,13 +92,17 @@ __PACKAGE__->register_method ({
 
        my @exclude = PVE::Tools::split_list(extract_param($param, 'exclude'));
        $param->{exclude} = PVE::VZDump::check_vmids(@exclude);
-       
+
        # exclude-path list need to be 0 separated
-       my @expaths = split(/\0/, $param->{'exclude-path'} || '');
-       $param->{'exclude-path'} = [ @expaths ];
+       if (defined($param->{'exclude-path'})) {
+           my @expaths = split(/\0/, $param->{'exclude-path'} || '');
+           $param->{'exclude-path'} = [ @expaths ];
+       }
 
-       my @mailto = PVE::Tools::split_list(extract_param($param, 'mailto'));
-       $param->{mailto} = [ @mailto ];
+       if (defined($param->{mailto})) {
+           my @mailto = PVE::Tools::split_list(extract_param($param, 'mailto'));
+           $param->{mailto} = [ @mailto ];
+       }
 
        die "you can only backup a single VM with option --stdout\n"
            if $param->{stdout} && scalar(@vmids) != 1;

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index dee2a347efb66762ba1f07e76515c4fcc1ac9333..cec84edc614dbc3997dbab8c1686c6e5aa80bf5c 100644 (file)
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -1,3 +1,9 @@
+pve-manager (2.1-7) unstable; urgency=low
+
+  * fix vzdump --exclude-path (allow to read value from vzdump.conf)
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 May 2012 07:24:30 +0200
+
 pve-manager (2.1-6) unstable; urgency=low
 
   * include Danish translation

diff --git a/defines.mk b/defines.mk
index 9e42c849e011a9d4113be9fa78068f110c126251..13f8411a2d60aa86a15ff2d2258630c0ae580090 100644 (file)
--- a/defines.mk
+++ b/defines.mk
@@ -2,7 +2,7 @@ RELEASE=2.1
 
 VERSION=2.1
 PACKAGE=pve-manager
-PACKAGERELEASE=6
+PACKAGERELEASE=7
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5