[pve-devel] applied: [PATCH storage 1/2] weaken matching for vzdump config extract filename

[Wolfgang Bumiller]

applied

On Fri, Jan 20, 2017 at 10:03:33AM +0100, Fabian Grünbichler wrote:
> to allow "pvesm extractconfig filename" when in the dump
> directory.
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> ---
>  PVE/Storage.pm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/PVE/Storage.pm b/PVE/Storage.pm
> index bfc34d4..b9ea42a 100755
> --- a/PVE/Storage.pm
> +++ b/PVE/Storage.pm
> @@ -1413,9 +1413,9 @@ sub extract_vzdump_config {
>  
>      my $archive = abs_filesystem_path($cfg, $volid);
>  
> -    if ($volid =~ /\/vzdump-(lxc|openvz)-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|(tar(\.(gz|lzo))?))$/) {
> +    if ($volid =~ /vzdump-(lxc|openvz)-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|(tar(\.(gz|lzo))?))$/) {
>  	return extract_vzdump_config_tar($archive,'^(\./etc/vzdump/(pct|vps)\.conf)$');
> -    } elsif ($volid =~ /\/vzdump-qemu-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|((tar|vma)(\.(gz|lzo))?))$/) {
> +    } elsif ($volid =~ /vzdump-qemu-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|((tar|vma)(\.(gz|lzo))?))$/) {
>  	my $format;
>  	my $comp;
>  	if ($7 eq 'tgz') {
> -- 
> 2.1.4