btrbk: action "archive": abort if receive targets of archive candidates exist at unexpected location. makes sure we dont have duplicates on our archives

pull/88/head
Axel Burri 2016-04-19 18:57:22 +02:00
parent 5e7a6e5ef4
commit 29b9c8fc60
1 changed files with 6 additions and 7 deletions

13
btrbk
View File

@ -1917,7 +1917,7 @@ sub get_receive_targets_fsroot($$@)
WARN "Receive target of \"$src_vol->{PRINT}\" exists at unexpected location: $text";
}
}
return \@unexpected;
return @unexpected;
}
@ -2678,12 +2678,11 @@ sub macro_archive_target($$$;$)
};
}
# this is a bit harsh, disabled for now
# if(scalar(@unexpected_location) {
# ABORTED($droot, "Receive targets of archive candidates exist at unexpected location");
# WARN "Skipping archiving of \"$sroot->{PRINT}/${snapshot_name}.*\": $abrt";
# return undef;
# }
if(scalar(@unexpected_location)) {
ABORTED($droot, "Receive targets of archive candidates exist at unexpected location");
WARN "Skipping archiving of \"$sroot->{PRINT}/${snapshot_name}.*\": $abrt";
return undef;
}
# add all present archives as informative_only: these are needed for correct results of schedule()
foreach my $dvol (@{vinfo_subvol_list($droot)})