[pve-devel] applied: [PATCH v4 storage 0/6] import/export api

Fabian Grünbichler f.gruenbichler at proxmox.com
Fri May 12 15:04:10 CEST 2017


applied whole series with one cleanup:

--------8<--------
commit 55f908a1cd99203d2bfa9b51b80af09e5ae67bf9
Author:     Fabian Grünbichler <f.gruenbichler at proxmox.com>
AuthorDate: Fri May 12 15:01:08 2017 +0200
Commit:     Fabian Grünbichler <f.gruenbichler at proxmox.com>
CommitDate: Fri May 12 15:01:08 2017 +0200

    migrate: cleanup: $free is always defined

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 77fdf33..5819bde 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -647,10 +647,8 @@ sub storage_migrate {
      warn "send/receive failed, cleaning up snapshot(s)..\n" if $err;
      eval { volume_snapshot_delete($cfg, $volid, '__migration__', 0) };
      warn "could not remove source snapshot: $@\n" if $@;
-     if (defined($free)) {
-         eval { run_command($free) };
-         warn "could not remove target snapshot: $@\n" if $@;
-     }
+     eval { run_command($free) };
+     warn "could not remove target snapshot: $@\n" if $@;
      die $err if $err;
    } else {
        die "$errstr - target type $tcfg->{type} is not valid\n";
-------->8--------




More information about the pve-devel mailing list