Rotation & cleaning bugs fixed

This commit is contained in:
Juan 2018-08-27 10:13:03 +02:00
parent 25d6c65dbb
commit 83aaf62914
2 changed files with 16 additions and 12 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
vn-vmware (1.0.22) stable; urgency=low
vn-vmware (1.0.23) stable; urgency=low
* Initial Release.

View File

@ -396,11 +396,17 @@ sub backup_machine() {
createParentDirectories => true
);
eval {
unless (-e $local_tmp_dir) {
die "Local backup directory is not accessible: $local_tmp_dir";
}
unless (-e $local_tmp_dir) {
log_message "Aborting, removing temporary directory: $ds_tmp_dir";
$file_manager->DeleteDatastoreFile(
name => $ds_tmp_dir,
datacenter => $dc
);
die "Local backup directory is not accessible: $local_tmp_dir";
}
eval {
my $vm_path_name = $vm->config->files->vmPathName;
log_message "Copying machine configuration file: $vm_path_name";
@ -469,11 +475,8 @@ sub backup_machine() {
$vm->RemoveAllSnapshots();
}
log_message "Removing temporary directory: $ds_tmp_dir";
$file_manager->DeleteDatastoreFile(
name => $ds_tmp_dir,
datacenter => $dc
);
"Removing temporary directory: $local_tmp_dir";
rmtree($local_tmp_dir);
if ($err) {
die $err;
@ -527,8 +530,9 @@ sub rotate_backup() {
die "Rotation aborted, because is trying to remove all backups.";
}
foreach my $deleteFile (@delete_files) {
log_message "Removing $deleteFile";
unlink $deleteFile;
my $deleteFilePath = "$local_dir/$deleteFile";
log_message "Removing $deleteFilePath";
unlink "$deleteFilePath";
}
if (scalar(@delete_files) == 0) {