Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-08-09 22:57:08 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-08-09 22:57:08 (GMT)
commit093a1981d50bbefc4e76a5c65b42baa76b095a81 (patch)
tree3afc463a8a52327d8d3657a8b45c95d2e1120ed3 /shell
parent9b12b11534a007c46e626b2b7b17265f4bddee5d (diff)
parentc095192d08afd61d3b8686c359106fd074c2e12a (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'shell')
-rw-r--r--shell/PresenceService/PresenceService.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/PresenceService/PresenceService.py b/shell/PresenceService/PresenceService.py
index 42ca409..e1851ab 100644
--- a/shell/PresenceService/PresenceService.py
+++ b/shell/PresenceService/PresenceService.py
@@ -567,8 +567,8 @@ class PresenceService(object):
browser_obj = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, st_browser),
avahi.DBUS_INTERFACE_SERVICE_TYPE_BROWSER)
except dbus.DBusException, exc:
- logging.error("got exception %s while attempting to browse domain %s on %i.%i" % (domain, interface, protocol))
str_exc = str(exc)
+ logging.error("got exception %s while attempting to browse domain %s on %i.%i" % (str_exc, domain, interface, protocol))
if str_exc.find("The name org.freedesktop.Avahi was not provided by any .service files") >= 0:
raise Exception("Avahi does not appear to be running. '%s'" % str_exc)
else: