Ignore local name collisions again

This commit is contained in:
Dan Williams 2006-09-29 16:53:42 -04:00
parent ca56406aa4
commit fc9c923da9

View File

@ -397,10 +397,14 @@ class Service(gobject.GObject):
logging.debug("Will register service with name='%s', stype='%s'," \ logging.debug("Will register service with name='%s', stype='%s'," \
" domain='%s', address='%s', port=%d, info='%s'" % (self._full_name, " domain='%s', address='%s', port=%d, info='%s'" % (self._full_name,
self._stype, self._domain, self._address, self._port, info)) self._stype, self._domain, self._address, self._port, info))
self._avahi_entry_group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0, try:
dbus.String(self._full_name), dbus.String(self._stype), self._avahi_entry_group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0,
dbus.String(self._domain), dbus.String(""), # let Avahi figure the 'host' out dbus.String(self._full_name), dbus.String(self._stype),
dbus.UInt16(self._port), info) 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.connect_to_signal('StateChanged', self.__entry_group_changed_cb)
self._avahi_entry_group.Commit() self._avahi_entry_group.Commit()