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

btrbk: fix exit status and transaction log when archive_exclude is set 

Similar to ABORTED=USER_SKIP (active commandline filter), archives
having ABORTED=ARCHIVE_EXCLUDE_SKIP (active archive_exclude
configuration) do not cause exit status 10 and are hidden from
transaction log.
pull/204/merge
Axel Burri 2018-02-26 14:35:26 +01:00
parent c0e0644eff
commit e75cf0c72c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
btrbk
View File

@ -378,7 +378,7 @@ sub ABORTED($;$)
$config = $config->{CONFIG} if($config->{CONFIG}); # accept vinfo for $config
return $config->{ABORTED} unless(defined($abrt));
unless($abrt eq "USER_SKIP") {
unless(($abrt eq "USER_SKIP") || ($abrt eq "ARCHIVE_EXCLUDE_SKIP")) {
$abrt =~ s/\n/\\\\/g;
$abrt =~ s/\r//g;
action("abort_" . ($config->{CONTEXT} || "undef"),
@ -4206,7 +4206,9 @@ sub exit_status
{
my $config = shift;
foreach my $subsection (@{$config->{SUBSECTION}}) {
return 10 if($subsection->{ABORTED} && ($subsection->{ABORTED} ne "USER_SKIP"));
return 10 if($subsection->{ABORTED} &&
($subsection->{ABORTED} ne "USER_SKIP") &&
($subsection->{ABORTED} ne "ARCHIVE_EXCLUDE_SKIP"));
return 10 if(exit_status($subsection));
}
return 0;