comparison src/core/sat_main.py @ 460:fb1abc0f8c6a

backend: added warning message when jabberfr workaround is used + fixed missing warning method
author Goffi <goffi@goffi.org>
date Tue, 13 Mar 2012 22:04:03 +0100
parents cf005701624b
children 448ce3c9e2ac
comparison
equal deleted inserted replaced
459:cf005701624b 460:fb1abc0f8c6a
35 from wokkel import compat 35 from wokkel import compat
36 from wokkel.xmppim import RosterItem 36 from wokkel.xmppim import RosterItem
37 37
38 from sat.bridge.DBus import DBusBridge 38 from sat.bridge.DBus import DBusBridge
39 import logging 39 import logging
40 from logging import debug, info, error 40 from logging import debug, info, warning, error
41 41
42 import sys 42 import sys
43 import os.path 43 import os.path
44 44
45 from sat.core import xmpp 45 from sat.core import xmpp
537 warning(_("Can't get information on identity [%(entity)s] for profile [%(profile)s]") % {'entity':entity, 'profile': profile}) 537 warning(_("Can't get information on identity [%(entity)s] for profile [%(profile)s]") % {'entity':entity, 'profile': profile})
538 538
539 defer_list = [] 539 defer_list = []
540 for item in disco_result._items: 540 for item in disco_result._items:
541 if item.entity.full().count('.') == 1: #XXX: workaround for a bug on jabberfr, tmp 541 if item.entity.full().count('.') == 1: #XXX: workaround for a bug on jabberfr, tmp
542 warning(_('Using jabberfr workaround, be sure your domain has at least two levels (e.g. "example.tld", not "example" alone)'))
542 continue 543 continue
543 args = [item.entity, profile] 544 args = [item.entity, profile]
544 defer_list.append(disco_client.requestInfo(item.entity).addCallbacks(_check_entity_cb, _errback, args, None, args)) 545 defer_list.append(disco_client.requestInfo(item.entity).addCallbacks(_check_entity_cb, _errback, args, None, args))
545 defer.DeferredList(defer_list).chainDeferred(initialized) 546 defer.DeferredList(defer_list).chainDeferred(initialized)
546 547