# HG changeset patch # User Goffi # Date 1317826105 -7200 # Node ID ccfd69d090c38355d48aa485a40c382b73a12619 # Parent cecd22241d56dd0b6c0a619508e01d3ea749dab3 core: workaround to avoid a bug in item detection on jabber.fr. Need more investigation with jabber.fr admins (may be a bug in ejabberd) diff -r cecd22241d56 -r ccfd69d090c3 src/core/sat_main.py --- a/src/core/sat_main.py Tue Oct 04 23:43:06 2011 +0200 +++ b/src/core/sat_main.py Wed Oct 05 16:48:25 2011 +0200 @@ -507,10 +507,16 @@ debug (_('Identity added: (%(category)s,%(type)s) ==> %(entity)s [%(profile)s]') % { 'category':category, 'type':type, 'entity':entity, 'profile':profile}) self.memory.addServerIdentity(category, type, entity, profile) + + def _errback(result, entity, profile): + warning(_("Can't get information on identity [%(entity)s] for profile [%(profile)s]") % {'entity':entity, 'profile': profile}) defer_list = [] for item in disco_result._items: - defer_list.append(disco_client.requestInfo(item.entity).addCallback(_check_entity_cb, item.entity, profile)) + if item.entity.full().count('.') == 1: #XXX: workaround for a bug on jabberfr, tmp + continue + args = [item.entity, profile] + defer_list.append(disco_client.requestInfo(item.entity).addCallbacks(_check_entity_cb, _errback, args, None, args)) defer.DeferredList(defer_list).chainDeferred(initialized)