]> git.proxmox.com Git - pve-zsync.git/commitdiff
remove now unnecessary if($disk)
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Mon, 28 Sep 2015 09:40:07 +0000 (11:40 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Fri, 16 Oct 2015 09:00:07 +0000 (11:00 +0200)
pve-zsync

index dfb3050c39d7d81ba02444cbabcbc6ec6a2b3e40..d784d192daa0c075779652e6b64e41f5ed7acd14 100644 (file)
--- a/pve-zsync
+++ b/pve-zsync
@@ -703,29 +703,27 @@ sub parse_disks {
            die "disk is not on ZFS Storage\n";
        }
 
            die "disk is not on ZFS Storage\n";
        }
 
-       if($disk) {
-           my $cmd = "";
-           $cmd .= "ssh root\@$ip " if $ip;
-           $cmd .= "pvesm path $stor$disk";
-           my $path = run_cmd($cmd);
-
-           if ($path =~ m/^\/dev\/zvol\/(\w+).*(\/$disk)$/) {
-
-               my @array = split('/', $1);
-               $disks->{$num}->{pool} = pop(@array);
-               $disks->{$num}->{all} = $disks->{$num}->{pool};
-               if (0 < @array) {
-                   $disks->{$num}->{path} = join('/', @array);
-                   $disks->{$num}->{all} .= "\/$disks->{$num}->{path}";
-               }
-               $disks->{$num}->{last_part} = $disk;
-               $disks->{$num}->{all} .= "\/$disk";
-
-               $num++;
-
-           } else {
-               die "ERROR: in path\n";
+       my $cmd = "";
+       $cmd .= "ssh root\@$ip " if $ip;
+       $cmd .= "pvesm path $stor$disk";
+       my $path = run_cmd($cmd);
+
+       if ($path =~ m/^\/dev\/zvol\/(\w+).*(\/$disk)$/) {
+
+           my @array = split('/', $1);
+           $disks->{$num}->{pool} = pop(@array);
+           $disks->{$num}->{all} = $disks->{$num}->{pool};
+           if (0 < @array) {
+               $disks->{$num}->{path} = join('/', @array);
+               $disks->{$num}->{all} .= "\/$disks->{$num}->{path}";
            }
            }
+           $disks->{$num}->{last_part} = $disk;
+           $disks->{$num}->{all} .= "\/$disk";
+
+           $num++;
+
+       } else {
+           die "ERROR: in path\n";
        }
     }
 
        }
     }