summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-29 17:01:50 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-29 17:01:50 +0000
commit252977cb615c34083999af21c43db77ece428110 (patch)
tree150fb95560e466e92929322a66176f73359575a8
parent13c41fbc48704fa4452570364ed85579b7094f9d (diff)
downloaddrakx-252977cb615c34083999af21c43db77ece428110.tar
drakx-252977cb615c34083999af21c43db77ece428110.tar.gz
drakx-252977cb615c34083999af21c43db77ece428110.tar.bz2
drakx-252977cb615c34083999af21c43db77ece428110.tar.xz
drakx-252977cb615c34083999af21c43db77ece428110.zip
workaround crahsing while handling strange DBus errors (hacky :-() such as:
"org.freedesktop.Hal.NoSuchDevice: No device with id /org/freedesktop/Hal/devices/volume_uuid_0d60bf68_9e31_46b5_b98a_ac61d2f96352" which results in: "Operation "eq": no method found, left argument in overloaded package Net::DBus::Error, right argument in overloaded package Net::DBus::Error at /usr/lib/libDrakX/standalone.pm line 199."
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/standalone.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 25e31dfa1..c0d7eb3bd 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakbug:
+ o handle strange DBus errors
+
Version 11.58 - 29 September 2008
- libDrakX:
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index d9dae154e..3eccdbe92 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -196,7 +196,7 @@ sub bug_handler {
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)) {
+ if (!$is_signal && eval { $error eq MDK::Common::String::formatError($error) }) {
warn $error;
exit(255);
}