From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Date: Wed, 30 Mar 2016 12:00:12 +0000 (+0200)
Subject: fix #923: uninitalized value in remove_lock
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=34f860a262f898899b236b14266d28206b7c34d9;p=pve-common.git

fix #923: uninitalized value in remove_lock
---

diff --git a/src/PVE/AbstractConfig.pm b/src/PVE/AbstractConfig.pm
index f1c0eb2..0799c8b 100644
--- a/src/PVE/AbstractConfig.pm
+++ b/src/PVE/AbstractConfig.pm
@@ -136,9 +136,10 @@ sub remove_lock {
     $class->lock_config($vmid, sub {
 	my $conf = $class->load_config($vmid);
 	if (!$conf->{lock}) {
-	    die "no lock found trying to remove lock '$lock'\n";
+	    my $lockstring = defined($lock) ? "'$lock' " : "any";
+	    die "no lock found trying to remove $lockstring lock\n";
 	} elsif (defined($lock) && $conf->{lock} ne $lock) {
-	    die "found lock '$conf->{lock}' trying to remove lock '$lock'\n";
+	    die "found lock '$conf->{lock}' trying to remove '$lock' lock\n";
 	}
 	delete $conf->{lock};
 	$class->write_config($vmid, $conf);