commit 854f2b6ef4f9ea1c304b2e77d552b930b28e7053
author David Pursehouse <david.pursehouse@sonymobile.com> Tue Jun 11 13:58:47 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 11 13:58:47 2013 +0000
tree 17c26004548ed39b2cfee350a63fe283148b445a
parent db2ad9dfce438dae14fed0a62b37f0028ee98ad1
parent a892b1006b5b7193262f3783b9678e2c76978a9b

Merge "sync: assign manifest_name earlier"

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index c7f02b3..002d05f 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -487,6 +487,8 @@
     if opt.manifest_name:
       self.manifest.Override(opt.manifest_name)
 
+    manifest_name = opt.manifest_name
+
     if opt.smart_sync or opt.smart_tag:
       if not self.manifest.manifest_server:
         print('error: cannot smart sync: no manifest server defined in '
@@ -526,7 +528,6 @@
                                                     (username, password),
                                                     1)
 
-      manifest_name = opt.manifest_name
       try:
         server = xmlrpc.client.Server(manifest_server)
         if opt.smart_sync: