commit efc986c5081fc9a504b698672d955300a99f24bb
author David Pursehouse <david.pursehouse@sonymobile.com> Fri Sep 27 02:24:39 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 27 02:24:39 2013 +0000
tree 8aa6ca5b14668fac22bdbc0230fc092ca2f6d71a
parent 70df18944a667329ec894a1df1e77381c5b0c09a
parent 351fe2c793437e1d8a0b222f8478c74cf60ae034

Merge changes I4b77af22,Ib5bc2de5

* changes:
  Sync: Improved error message when manifest server RPC call fails
  Sync: Print name of manifest server used for smart sync/smart tag

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index 002d05f..e9d52b7 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -496,6 +496,8 @@
         sys.exit(1)
 
       manifest_server = self.manifest.manifest_server
+      if not opt.quiet:
+        print('Using manifest server %s' % manifest_server)
 
       if not '@' in manifest_server:
         username = None
@@ -564,7 +566,8 @@
             sys.exit(1)
           self._ReloadManifest(manifest_name)
         else:
-          print('error: %s' % manifest_str, file=sys.stderr)
+          print('error: manifest server RPC call failed: %s' %
+                manifest_str, file=sys.stderr)
           sys.exit(1)
       except (socket.error, IOError, xmlrpc.client.Fault) as e:
         print('error: cannot connect to manifest server %s:\n%s'