mirror of
https://gerrit.googlesource.com/git-repo
synced 2025-01-08 16:14:26 +00:00
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
This commit is contained in:
commit
efc986c508
@ -496,6 +496,8 @@ later is required to fix a server side protocol bug.
|
||||
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 @@ later is required to fix a server side protocol bug.
|
||||
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'
|
||||
|
Loading…
Reference in New Issue
Block a user