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

btrbk: honor incremental_resolve on targets (fix: defaults to "mountpoint" instead of "directory") 

Use $resolve_droot instead of $droot for calls to get_best_correlated
(probably missed commit), same as $resolve_sroot.

Fixes possible regression of:

514e69243a btrbk: add "incremental_resolve" configuration option
pull/286/head
Axel Burri 2019-05-19 19:01:50 +02:00
parent 01230cde22
commit 45b487707f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
btrbk
View File

@ -3251,7 +3251,7 @@ sub get_best_parent($$$;@)
$vinfo = vinfo_resolved_all_mountpoints($_, $svol); $vinfo = vinfo_resolved_all_mountpoints($_, $svol);
} }
if($vinfo) { if($vinfo) {
my $correlated = get_best_correlated($droot, $vinfo, %gbc_opts); my $correlated = get_best_correlated($resolve_droot, $vinfo, %gbc_opts);
push @c_related, $correlated if($correlated); push @c_related, $correlated if($correlated);
$c_rel_id{$_->{id}} = $correlated; $c_rel_id{$_->{id}} = $correlated;
} else { } else {
@ -3285,8 +3285,8 @@ sub get_best_parent($$$;@)
my @sbdl_newer = sort { cmp_date($a->{node}{BTRBK_DATE}, $b->{node}{BTRBK_DATE}) } my @sbdl_newer = sort { cmp_date($a->{node}{BTRBK_DATE}, $b->{node}{BTRBK_DATE}) }
grep { cmp_date($_->{node}{BTRBK_DATE}, $svol->{node}{BTRBK_DATE}) > 0 } @$snaproot_btrbk_direct_leaf; grep { cmp_date($_->{node}{BTRBK_DATE}, $svol->{node}{BTRBK_DATE}) > 0 } @$snaproot_btrbk_direct_leaf;
@c_snapdir_older = map { $c_rel_id{$_->{node}{id}} // get_best_correlated($droot, $_, %gbc_opts) // () } @sbdl_older; @c_snapdir_older = map { $c_rel_id{$_->{node}{id}} // get_best_correlated($resolve_droot, $_, %gbc_opts) // () } @sbdl_older;
@c_snapdir_newer = map { $c_rel_id{$_->{node}{id}} // get_best_correlated($droot, $_, %gbc_opts) // () } @sbdl_newer; @c_snapdir_newer = map { $c_rel_id{$_->{node}{id}} // get_best_correlated($resolve_droot, $_, %gbc_opts) // () } @sbdl_newer;
} }
if($loglevel >= 4) { if($loglevel >= 4) {