Mercurial > libervia-backend
changeset 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 | 4e361d295bca |
| files | src/core/sat_main.py src/memory/memory.py |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/sat_main.py Tue Mar 06 09:07:24 2012 +0100 +++ b/src/core/sat_main.py Tue Mar 13 22:04:03 2012 +0100 @@ -37,7 +37,7 @@ from sat.bridge.DBus import DBusBridge import logging -from logging import debug, info, error +from logging import debug, info, warning, error import sys import os.path @@ -539,6 +539,7 @@ defer_list = [] for item in disco_result._items: if item.entity.full().count('.') == 1: #XXX: workaround for a bug on jabberfr, tmp + warning(_('Using jabberfr workaround, be sure your domain has at least two levels (e.g. "example.tld", not "example" alone)')) continue args = [item.entity, profile] defer_list.append(disco_client.requestInfo(item.entity).addCallbacks(_check_entity_cb, _errback, args, None, args))
--- a/src/memory/memory.py Tue Mar 06 09:07:24 2012 +0100 +++ b/src/memory/memory.py Tue Mar 13 22:04:03 2012 +0100 @@ -640,7 +640,8 @@ """Helper method to get first available entity for a service""" entities = self.getServerServiceEntities(category, type, profile) if entities == None: - warning(_("Entities not available, maybe they haven't been asked to server yet ?")) + warning(_("Entities (%(category)s/%(type)s) not available, maybe they haven't been asked to server yet ?") % {"category":category, + "type":type}) return None else: return list(entities)[0] if entities else None