summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-29 15:28:11 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-29 15:28:11 +0000
commitc3ab64f505b1c2b005e7f2ab9f0e54bf2d286904 (patch)
treeb00411ab295e89861625cb5b11930ea283957bbf
parent3ee9e4868202942a41fd801ca8031f203f0ce71e (diff)
downloaddrakx-c3ab64f505b1c2b005e7f2ab9f0e54bf2d286904.tar
drakx-c3ab64f505b1c2b005e7f2ab9f0e54bf2d286904.tar.gz
drakx-c3ab64f505b1c2b005e7f2ab9f0e54bf2d286904.tar.bz2
drakx-c3ab64f505b1c2b005e7f2ab9f0e54bf2d286904.tar.xz
drakx-c3ab64f505b1c2b005e7f2ab9f0e54bf2d286904.zip
- drakbug:
o do not catch exception if $^S is undef (occurs when "eval { require foo }" and foo.pm do "use not_available")
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/standalone.pm2
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5b91240d6..e489edb43 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- drakbug:
+ o do not catch exception if $^S is undef
+ (occurs when "eval { require foo }" and foo.pm do "use not_available")
+
Version 10.6.25 - 28 February 2008
- harddrake:
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 07c251daa..994ff7edc 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -193,7 +193,7 @@ sub bug_handler {
my ($error, $is_signal) = @_;
# exceptions in eval are OK:
- return if $error && $^S && !$is_signal;
+ return if $error && $^S ne '0' && !$is_signal;
# exceptions with "\n" are normal ways to quit:
if (!$is_signal && $error eq MDK::Common::String::formatError($error)) {