From 336ec53a487c0f560c12650528097a7a93673370 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 30 May 2012 07:25:49 +0200 Subject: [PATCH] fix vzdump --exclude-path --- PVE/API2/VZDump.pm | 14 +++++++++----- debian/changelog.Debian | 6 ++++++ defines.mk | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/PVE/API2/VZDump.pm b/PVE/API2/VZDump.pm index 935e2e97..dc0836b1 100644 --- 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 dee2a347..cec84edc 100644 --- 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 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 9e42c849..13f8411a 100644 --- 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 -- 2.39.2