summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2013-06-11 13:58:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-06-11 13:58:47 +0000
commit854f2b6ef4f9ea1c304b2e77d552b930b28e7053 (patch)
tree17c26004548ed39b2cfee350a63fe283148b445a
parentdb2ad9dfce438dae14fed0a62b37f0028ee98ad1 (diff)
parenta892b1006b5b7193262f3783b9678e2c76978a9b (diff)
downloadgit-repo-854f2b6ef4f9ea1c304b2e77d552b930b28e7053.tar.gz
Merge "sync: assign manifest_name earlier"
-rw-r--r--subcmds/sync.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index c7f02b35..002d05f0 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -487,6 +487,8 @@ later is required to fix a server side protocol bug.
487 if opt.manifest_name: 487 if opt.manifest_name:
488 self.manifest.Override(opt.manifest_name) 488 self.manifest.Override(opt.manifest_name)
489 489
490 manifest_name = opt.manifest_name
491
490 if opt.smart_sync or opt.smart_tag: 492 if opt.smart_sync or opt.smart_tag:
491 if not self.manifest.manifest_server: 493 if not self.manifest.manifest_server:
492 print('error: cannot smart sync: no manifest server defined in ' 494 print('error: cannot smart sync: no manifest server defined in '
@@ -526,7 +528,6 @@ later is required to fix a server side protocol bug.
526 (username, password), 528 (username, password),
527 1) 529 1)
528 530
529 manifest_name = opt.manifest_name
530 try: 531 try:
531 server = xmlrpc.client.Server(manifest_server) 532 server = xmlrpc.client.Server(manifest_server)
532 if opt.smart_sync: 533 if opt.smart_sync: