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

btrbk: action ls: fix match on child subvols of "/" 

If PATH contains double slash (intentional behavior of vinfo_child),
the match on root_path fails. Fixed by removing "//" from path.
pull/334/head
Axel Burri 2020-03-06 23:13:22 +01:00
parent cb7d49d075
commit 30edf5b766
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
btrbk
View File

@ -5315,7 +5315,7 @@ MAIN:
$mountinfo_cache{$root_vol->{MACHINE_ID}} = $mountinfo;
}
my @path_hidden;
my @mnt_path_hidden;
foreach my $mnt (reverse @$mountinfo) {
my $mnt_path = $mnt->{mount_point};
$mnt_path .= '/' unless($mnt_path =~ /\/$/); # append trailing slash
@ -5334,11 +5334,12 @@ MAIN:
my $subvol_list = vinfo_subvol_list($vol);
foreach my $svol ($vol, @$subvol_list) {
my $svol_path = $svol->{PATH};
$svol_path =~ s/^\/\//\//; # sanitize "//" (see vinfo_child)
$svol_path .= '/' unless($svol_path =~ /\/$/); # append trailing slash
next unless($svol_path =~ /^\Q$root_path\E/);
if(grep { $svol_path =~ /^\Q$_\E/ } @path_hidden) {
if(grep { $svol_path =~ /^\Q$_\E/ } @mnt_path_hidden) {
DEBUG "subvolume is hidden by another mount point: $svol->{PRINT}";
next;
}
@ -5358,7 +5359,7 @@ MAIN:
}
}
last if($root_path =~ /^\Q$mnt_path\E/);
push @path_hidden, ($mnt->{mount_point} . '/');
push @mnt_path_hidden, $mnt_path;
}
}