cleanup: detete trailing whitespace

This commit is contained in:
Dietmar Maurer 2012-08-23 07:36:48 +02:00
parent b67900f17a
commit f5eb281ad3
2 changed files with 17 additions and 19 deletions

View File

@ -416,9 +416,8 @@ sub phase3_cleanup {
die "Failed to move config to node '$self->{node}' - rename failed: $!\n" die "Failed to move config to node '$self->{node}' - rename failed: $!\n"
if !rename($conffile, $newconffile); if !rename($conffile, $newconffile);
## now that config file is move, we can resume vm on target if livemigrate # now that config file is move, we can resume vm on target if livemigrate
if ($self->{tunnel}) { if ($self->{tunnel}) {
my $cmd = [@{$self->{rem_ssh}}, 'qm', 'resume', $vmid, '--skiplock']; my $cmd = [@{$self->{rem_ssh}}, 'qm', 'resume', $vmid, '--skiplock'];
eval{ PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {}) }; eval{ PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {}) };
if (my $err = $@) { if (my $err = $@) {
@ -427,7 +426,6 @@ sub phase3_cleanup {
} }
} }
# always stop local VM # always stop local VM
eval { PVE::QemuServer::vm_stop($self->{storecfg}, $vmid, 1, 1); }; eval { PVE::QemuServer::vm_stop($self->{storecfg}, $vmid, 1, 1); };
if (my $err = $@) { if (my $err = $@) {