From fc9c923da9338f47987377a69b60d7b7f8ce2e32 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 29 Sep 2006 16:53:42 -0400 Subject: [PATCH] Ignore local name collisions again --- services/presence/Service.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/services/presence/Service.py b/services/presence/Service.py index 1d70baa0..2f0e22fa 100644 --- a/services/presence/Service.py +++ b/services/presence/Service.py @@ -397,10 +397,14 @@ class Service(gobject.GObject): logging.debug("Will register service with name='%s', stype='%s'," \ " domain='%s', address='%s', port=%d, info='%s'" % (self._full_name, self._stype, self._domain, self._address, self._port, info)) - self._avahi_entry_group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0, - dbus.String(self._full_name), dbus.String(self._stype), - dbus.String(self._domain), dbus.String(""), # let Avahi figure the 'host' out - dbus.UInt16(self._port), info) + try: + self._avahi_entry_group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0, + dbus.String(self._full_name), dbus.String(self._stype), + dbus.String(self._domain), dbus.String(""), # let Avahi figure the 'host' out + dbus.UInt16(self._port), info) + except dbus.DBusException, exc: + # Local name collision and stuff + pass self._avahi_entry_group.connect_to_signal('StateChanged', self.__entry_group_changed_cb) self._avahi_entry_group.Commit()