# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1387200998 -3600
# Node ID a0f4a80a65369b99e87aa7cf65629ca8eedcea62
# Parent  5aff0beddb28cf0f7f4c389ad79fc23dfe4bf031
core: bug fix for serverDiscoItems (bad use of addCallbacks)

diff -r 5aff0beddb28 -r a0f4a80a6536 src/core/sat_main.py
--- a/src/core/sat_main.py	Mon Dec 16 14:35:26 2013 +0100
+++ b/src/core/sat_main.py	Mon Dec 16 14:36:38 2013 +0100
@@ -708,7 +708,7 @@
 
         def errback(failure, method, jid_, profile):
             # the target server is not reachable
-            logging.error("disco.%s on %s failed! [%s]" % (method.func_name, jid_, profile))
+            logging.error("disco.%s on %s failed! [%s]" % (method.func_name, jid_.userhost(), profile))
             logging.error("reason: %s" % failure.getErrorMessage())
             if method == disco.requestInfo:
                 features = self.memory.server_features.setdefault(profile, {})
@@ -727,7 +727,7 @@
                 return d2.addCallback(haveItemsFeature)
 
         d = disco.requestInfo(jid_).addCallback(self.serverDisco, jid_, profile)
-        d.addCallbacks(callback, errback, [], [disco.requestInfo, jid_, profile])
+        d.addCallbacks(callback, errback, [], errbackArgs=[disco.requestInfo, jid_, profile])
         return d
 
     ## callbacks ##