perlcritic: avoid conditional variable declaration

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 2552addebcbea90c4d5d7152ca787344f222e89e..7a0f96305cf26c069d3b0ba6521b266d6414b18d 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -713,9 +713,12 @@ sub get_partnum {
 sub get_blockdev {
     my ($part_path) = @_;
 
-    my $dev = $1 if $part_path =~ m|^/dev/(.*)$|;
-    my $link = readlink "/sys/class/block/$dev";
-    my $block_dev = $1 if $link =~ m|([^/]*)/$dev$|;
+    my ($dev, $block_dev);
+    if ($part_path =~ m|^/dev/(.*)$|) {
+       $dev = $1;
+       my $link = readlink "/sys/class/block/$dev";
+       $block_dev = $1 if $link =~ m|([^/]*)/$dev$|;
+    }
 
     die "Can't parse parent device\n" if !defined($block_dev);
     die "No valid block device\n" if index($dev, $block_dev) == -1;

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index bd6e15e9f1f9f05dec9a6cbcd88391705ff08212..13fea736be9d93c671e97eddaabc2c3e4a0d04ce 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -1411,7 +1411,8 @@ sub decompressor_info {
     die "ERROR: archive format not defined\n"
        if !defined($decompressor->{$format});
 
-    my $decomp = $decompressor->{$format}->{$comp} if $comp;
+    my $decomp;
+    $decomp = $decompressor->{$format}->{$comp} if $comp;
 
     my $info = {
        format => $format,