From 427cecf0c0bd5f17ae61ba01978fb41c868704ce Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Fri, 12 Nov 2010 06:33:00 +0100 Subject: [PATCH] [equo] catch DBusException exception when trying to use org.entropy.Client dbus interface --- client/text_repositories.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/text_repositories.py b/client/text_repositories.py index e2dba72fb..b8d1c4383 100644 --- a/client/text_repositories.py +++ b/client/text_repositories.py @@ -366,7 +366,7 @@ def _do_dbus_sync(): def bail_out(err): print_error(darkred(" @@ ")+brown("%s" % ( - _("sys-apps/entropy-client-services not installed. Update not allowed."),) )) + _("sys-apps/entropy-client-services not installed or configured. Update not allowed."),) )) if err: print_error(str(err)) @@ -401,7 +401,11 @@ def _do_dbus_sync(): if _entropy_dbus_object is not None: iface = dbus.Interface(_entropy_dbus_object, dbus_interface = "org.entropy.Client") - iface.trigger_check() + try: + iface.trigger_check() + except dbus.exceptions.DBusException as err: + bail_out(err) + return 1 info_txt = _("Have a nice day") print_info(brown(info_txt) + ".") return 0