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

btrbk: cosmetics: change error message in btrfs_subvolume_delete; add comments

pull/245/head
Axel Burri 2018-07-12 15:12:08 +02:00
parent faec212324
commit 47f6f730ab
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
btrbk
View File

@ -1277,13 +1277,15 @@ sub btrfs_subvolume_delete($@)
catch_stderr => 1, # hack for shell-based run_cmd() catch_stderr => 1, # hack for shell-based run_cmd()
filter_stderr => sub { filter_stderr => sub {
# catch errors from btrfs command # catch errors from btrfs command
# NOTE: this is NOT RELIABLE ANY MORE (path is not printed in btrfs-progs >= 4.16), e.g.:
# "ERROR: Could not statfs: No such file or directory"
my @error_lines = split("\n", $_); my @error_lines = split("\n", $_);
foreach (@error_lines) { foreach (@error_lines) {
next if(/^Delete subvolume/); # NOTE: stdout is also reflected here! next if(/^Delete subvolume/); # NOTE: stdout is also reflected here!
if(/^ERROR: cannot access subvolume ($file_match):/ || if(/^ERROR: cannot access subvolume ($file_match):/ || # btrfs-progs < 4.16
/^ERROR: not a subvolume: ($file_match)/ || /^ERROR: not a subvolume: ($file_match)/ || # btrfs-progs < 4.16
/^ERROR: cannot find real path for '($file_match)':/ || /^ERROR: cannot find real path for '($file_match)':/ ||
/^ERROR: cannot delete '($file_match)'/ || /^ERROR: cannot delete '($file_match)'/ || # btrfs-progs < 4.16
/^ERROR: cannot access subvolume '($file_match)'$/ || # btrfs-progs < 4.4 /^ERROR: cannot access subvolume '($file_match)'$/ || # btrfs-progs < 4.4
/^ERROR: error accessing '($file_match)'/ || # btrfs-progs < 4.4 /^ERROR: error accessing '($file_match)'/ || # btrfs-progs < 4.4
/^ERROR: '($file_match)' is not a subvolume/ || # btrfs-progs < 4.4 /^ERROR: '($file_match)' is not a subvolume/ || # btrfs-progs < 4.4
@ -1326,7 +1328,7 @@ sub btrfs_subvolume_delete($@)
} }
if(@unparsed_errors) { if(@unparsed_errors) {
@deleted = (); @deleted = ();
ERROR "Failed to parse error messages, assuming nothing deleted"; ERROR "Failed to delete subvolume, assuming nothing deleted";
ERROR "[delete]: $_" foreach(@unparsed_errors); ERROR "[delete]: $_" foreach(@unparsed_errors);
ERROR "Failed to delete subvolume: $_" foreach(map( { $_->{PRINT} } @$targets)); ERROR "Failed to delete subvolume: $_" foreach(map( { $_->{PRINT} } @$targets));
} }