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

btrbk: ABORTED() now sets $abrt to last message (useful for warnings after abort)

pull/73/head
Axel Burri 2016-03-07 19:17:33 +01:00
parent 96faae9659
commit ab4ded9830
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
btrbk
View File

@ -176,6 +176,7 @@ my $dryrun;
my $loglevel = 1; my $loglevel = 1;
my $show_progress = 0; my $show_progress = 0;
my $err = ""; my $err = "";
my $abrt = ""; # last ABORTED() message
my $output_format; my $output_format;
my $tlog_fh; my $tlog_fh;
my $current_transaction; my $current_transaction;
@ -252,21 +253,21 @@ sub ERROR { my $t = shift; print STDERR "ERROR: $t\n"; }
sub ABORTED($;$) sub ABORTED($;$)
{ {
my $config = shift; my $config = shift;
my $t = shift; $abrt = shift;
$config = $config->{CONFIG} unless($config->{CONTEXT}); $config = $config->{CONFIG} unless($config->{CONTEXT});
return $config->{ABORTED} unless(defined($t)); return $config->{ABORTED} unless(defined($abrt));
unless($t eq "USER_SKIP") { unless($abrt eq "USER_SKIP") {
$t =~ s/\n/\\\\/g; $abrt =~ s/\n/\\\\/g;
$t =~ s/\r//g; $abrt =~ s/\r//g;
action("abort_" . ($config->{CONTEXT} || "undef"), action("abort_" . ($config->{CONTEXT} || "undef"),
status => "ABORT", status => "ABORT",
vinfo_prefixed_keys("target", vinfo($config->{url}, $config)), vinfo_prefixed_keys("target", vinfo($config->{url}, $config)),
message => $t, message => $abrt,
); );
} }
$config->{ABORTED} = $t; $abrt = 1 unless($abrt); # make sure $abrt is always a true value
return $t; $config->{ABORTED} = $abrt;
} }