summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-06 13:26:18 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-06 13:26:18 +0000
commitb841f2ace37096d420551a71bfc80882abbb5d65 (patch)
tree2efbc19ad445748836c1b0a62d70589ca47159d8
parent8296a2ef96c5a86c0c87a323da7be2b57e5469c8 (diff)
downloaddrakx-b841f2ace37096d420551a71bfc80882abbb5d65.tar
drakx-b841f2ace37096d420551a71bfc80882abbb5d65.tar.gz
drakx-b841f2ace37096d420551a71bfc80882abbb5d65.tar.bz2
drakx-b841f2ace37096d420551a71bfc80882abbb5d65.tar.xz
drakx-b841f2ace37096d420551a71bfc80882abbb5d65.zip
exceptions with "\n" are considered normal ways to quit and thus do not fire up
drakbug (eg: #32292)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/standalone.pm5
2 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5080afd2a..19a152f3b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakbug:
+ o exceptions with "\n" are considered normal ways to quit and thus
+ do not fire up drakbug (eg: #32292)
- diskdrake:
o restore progress bar when formatting ext3
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index c20381911..d2035e469 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -191,6 +191,11 @@ sub bug_handler {
my ($error) = @_;
# exceptions in eval are OK:
return if $error && $^S;
+ # exceptions with "\n" are normal ways to quit:
+ if ($error !~ /at line/) {
+ warn $error;
+ exit(255);
+ }
# we want the full backtrace:
$error .= common::backtrace() if $error;
my $progname = $0;