From 252977cb615c34083999af21c43db77ece428110 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 29 Sep 2008 17:01:50 +0000
Subject: 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."
---
 perl-install/NEWS          | 3 +++
 perl-install/standalone.pm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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);
     }
-- 
cgit v1.2.1