android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-01-08 16:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes I4b77af22,Ib5bc2de5

Browse Source 
* changes:
  Sync: Improved error message when manifest server RPC call fails
  Sync: Print name of manifest server used for smart sync/smart tag
This commit is contained in:
David Pursehouse 2013-09-27 02:24:39 +00:00 committed by Gerrit Code Review
commit efc986c508
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subcmds/sync.py
View File

@ -496,6 +496,8 @@ later is required to fix a server side protocol bug.
sys.exit(1) sys.exit(1)
manifest_server = self.manifest.manifest_server manifest_server = self.manifest.manifest_server
if not opt.quiet:
print('Using manifest server %s' % manifest_server)
if not '@' in manifest_server: if not '@' in manifest_server:
username = None username = None
@ -564,7 +566,8 @@ later is required to fix a server side protocol bug.
sys.exit(1) sys.exit(1)
self._ReloadManifest(manifest_name) self._ReloadManifest(manifest_name)
else: 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) sys.exit(1)
except (socket.error, IOError, xmlrpc.client.Fault) as e: except (socket.error, IOError, xmlrpc.client.Fault) as e:
print('error: cannot connect to manifest server %s:\n%s' print('error: cannot connect to manifest server %s:\n%s'