ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: macro_archive_target(): only warn on unexpected targets, not abort

pull/88/head
Axel Burri 2016-04-16 01:32:25 +02:00
parent de05b99757
commit 774e6ef842
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
btrbk
View File

@ -2653,7 +2653,7 @@ sub macro_archive_target($$$;$)
my @receive_targets = get_receive_targets($droot, $svol, exact_match => 1, warn_unexpected => 1, ret_unexpected => \$unexpected_count);
# don't abort right here, we want to warn about all unexpected targets
$abort_unexpected_location += $unexpected_count;
next if($abort_unexpected_location || scalar(@receive_targets));
next if(scalar(@receive_targets));
DEBUG "Adding archive candidate: $svol->{PRINT}";
@ -2662,11 +2662,13 @@ sub macro_archive_target($$$;$)
preserve => $svol->{node}{FORCE_PRESERVE},
};
}
if($abort_unexpected_location) {
ABORTED($droot, "Receive targets of archive candidates exist at unexpected location");
WARN "Skipping archiving of \"$sroot->{PRINT}/${snapshot_name}.*\": $abrt";
return undef;
}
# this is a bit harsh, disabled for now
# if($abort_unexpected_location) {
# ABORTED($droot, "Receive targets of archive candidates exist at unexpected location");
# WARN "Skipping archiving of \"$sroot->{PRINT}/${snapshot_name}.*\": $abrt";
# return undef;
# }
foreach my $dvol (@{vinfo_subvol_list($droot, sort => 'path')})
{