summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2013-09-25 17:54:26 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2013-09-25 19:12:13 +0900
commit351fe2c793437e1d8a0b222f8478c74cf60ae034 (patch)
tree9eb3b9ada1de282765919e083c49f06295a42f30
parentfb99c719390196e35c27f30f875c1b796c307585 (diff)
downloadgit-repo-351fe2c793437e1d8a0b222f8478c74cf60ae034.tar.gz
Sync: Improved error message when manifest server RPC call fails
When the RPC call fails, the error message returned by the server is printed, but it is not obvious that this is caused by RPC call failure. Prefix the error message with a descriptive message that explains what went wrong. Change-Id: I4b77af22aacc2e9843c4df9d06bf54e41d9692ff
-rw-r--r--subcmds/sync.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index fcc6641f..e9d52b7b 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -566,7 +566,8 @@ later is required to fix a server side protocol bug.
566 sys.exit(1) 566 sys.exit(1)
567 self._ReloadManifest(manifest_name) 567 self._ReloadManifest(manifest_name)
568 else: 568 else:
569 print('error: %s' % manifest_str, file=sys.stderr) 569 print('error: manifest server RPC call failed: %s' %
570 manifest_str, file=sys.stderr)
570 sys.exit(1) 571 sys.exit(1)
571 except (socket.error, IOError, xmlrpc.client.Fault) as e: 572 except (socket.error, IOError, xmlrpc.client.Fault) as e:
572 print('error: cannot connect to manifest server %s:\n%s' 573 print('error: cannot connect to manifest server %s:\n%s'