From 8d070cfb254a21ec3f7a07c123165edf1ce379eb Mon Sep 17 00:00:00 2001 From: Conley Owens Date: Tue, 6 Nov 2012 13:14:31 -0800 Subject: [PATCH] Always show --manifest-server-* options The --manifest-server-* flags broke the smartsync subcmd since the corresponding variables weren't getting set. This change ensures that they will always be set, regardless of whether we are using sync -s or smartsync. Change-Id: I1b642038787f2114fa812ecbc15c64e431bbb829 --- subcmds/sync.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/subcmds/sync.py b/subcmds/sync.py index 15f69f7b..d6389118 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -173,6 +173,12 @@ later is required to fix a server side protocol bug. p.add_option('--no-clone-bundle', dest='no_clone_bundle', action='store_true', help='disable use of /clone.bundle on HTTP/HTTPS') + p.add_option('-u', '--manifest-server-username', action='store', + dest='manifest_server_username', + help='username to authenticate with the manifest server') + p.add_option('-p', '--manifest-server-password', action='store', + dest='manifest_server_password', + help='password to authenticate with the manifest server') if show_smart: p.add_option('-s', '--smart-sync', dest='smart_sync', action='store_true', @@ -180,12 +186,6 @@ later is required to fix a server side protocol bug. p.add_option('-t', '--smart-tag', dest='smart_tag', action='store', help='smart sync using manifest from a known tag') - p.add_option('-u', '--manifest-server-username', action='store', - dest='manifest_server_username', - help='username to authenticate with the manifest server') - p.add_option('-p', '--manifest-server-password', action='store', - dest='manifest_server_password', - help='password to authenticate with the manifest server') g = p.add_option_group('repo Version options') g.add_option('--no-repo-verify',