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

btrbk: init sroot as late as possible when expanding wildcards

pull/334/head
Axel Burri 2019-12-14 17:06:21 +01:00
parent 37b30caeb2
commit 9e13dbd933
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
btrbk
View File

@ -5628,25 +5628,30 @@ MAIN:
# read-in subvolume list (and expand globs) only if needed # read-in subvolume list (and expand globs) only if needed
next unless(grep defined($_->{GLOB_CONTEXT}), @{$config_vol->{SUBSECTION}}); next unless(grep defined($_->{GLOB_CONTEXT}), @{$config_vol->{SUBSECTION}});
my $sroot = vinfo($config_vol->{url}, $config_vol); my $sroot_glob; # read-in late
unless(vinfo_init_root($sroot)) {
ABORTED($sroot, "Failed to fetch subvolume detail");
WARN "Skipping volume \"$sroot->{PRINT}\": " . ABORTED_TEXT($sroot), map("... $_", @stderr);
next;
}
my @vol_subsection_expanded; my @vol_subsection_expanded;
foreach my $config_subvol (@{$config_vol->{SUBSECTION}}) { foreach my $config_subvol (@{$config_vol->{SUBSECTION}}) {
die unless($config_subvol->{CONTEXT} eq "subvolume"); die unless($config_subvol->{CONTEXT} eq "subvolume");
if($config_subvol->{GLOB_CONTEXT}) { if($config_subvol->{GLOB_CONTEXT}) {
my $globs = $config_subvol->{rel_path}; my $globs = $config_subvol->{rel_path};
INFO "Expanding wildcards: $sroot->{PRINT}/$globs";
# read-in subvolume list once, only if needed
unless(defined($sroot_glob)) {
$sroot_glob = vinfo($config_vol->{url}, $config_vol);
unless(vinfo_init_root($sroot_glob)) {
ABORTED($sroot_glob, "Failed to fetch subvolume detail");
WARN "Skipping subvolume (wildcards) \"$sroot_glob->{PRINT}/$globs\": " . ABORTED_TEXT($sroot_glob), map("... $_", @stderr);
last;
}
}
INFO "Expanding wildcards: $sroot_glob->{PRINT}/$globs";
# support "*some*file*", "*/*" # support "*some*file*", "*/*"
my $match = join('[^\/]*', map(quotemeta($_), split(/\*+/, $globs, -1))); my $match = join('[^\/]*', map(quotemeta($_), split(/\*+/, $globs, -1)));
TRACE "translated globs \"$globs\" to regex \"$match\""; TRACE "translated globs \"$globs\" to regex \"$match\"";
my $expand_count = 0; my $expand_count = 0;
foreach my $vol (@{vinfo_subvol_list($sroot, sort => 'path')}) foreach my $vol (@{vinfo_subvol_list($sroot_glob, sort => 'path')})
{ {
if($vol->{node}{readonly}) { if($vol->{node}{readonly}) {
TRACE "skipping readonly subvolume: $vol->{PRINT}"; TRACE "skipping readonly subvolume: $vol->{PRINT}";
@ -5674,7 +5679,7 @@ MAIN:
$expand_count += 1; $expand_count += 1;
} }
unless($expand_count) { unless($expand_count) {
WARN "No subvolumes found matching: $sroot->{PRINT}/$globs"; WARN "No subvolumes found matching: $sroot_glob->{PRINT}/$globs";
} }
} }
else { else {