Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(334)

Side by Side Diff: gsutil.py

Issue 812223002: Args fix for gsutil.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Also use parse_known_args Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2014 The Chromium Authors. All rights reserved. 2 # Copyright 2014 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """Run a pinned gsutil.""" 6 """Run a pinned gsutil."""
7 7
8 8
9 import argparse 9 import argparse
10 import shutil 10 import shutil
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 call(cmd) 128 call(cmd)
129 129
130 130
131 def parse_args(): 131 def parse_args():
132 parser = argparse.ArgumentParser() 132 parser = argparse.ArgumentParser()
133 parser.add_argument('--force-version') 133 parser.add_argument('--force-version')
134 parser.add_argument('--fallback', default=DEFAULT_FALLBACK_GSUTIL) 134 parser.add_argument('--fallback', default=DEFAULT_FALLBACK_GSUTIL)
135 parser.add_argument('--target', default=DEFAULT_BIN_DIR) 135 parser.add_argument('--target', default=DEFAULT_BIN_DIR)
136 parser.add_argument('args', nargs=argparse.REMAINDER) 136 parser.add_argument('args', nargs=argparse.REMAINDER)
137 137
138 args = parser.parse_args() 138 args, extras = parser.parse_known_args()
139 if args.args and args.args[0] == '--':
140 args.args.pop(0)
141 if extras:
142 args.args = extras + args.args
139 return args.force_version, args.fallback, args.target, args.args 143 return args.force_version, args.fallback, args.target, args.args
140 144
141 145
142 def main(): 146 def main():
143 force_version, fallback, target, args = parse_args() 147 force_version, fallback, target, args = parse_args()
144 run_gsutil(force_version, fallback, target, args) 148 run_gsutil(force_version, fallback, target, args)
145 149
146 if __name__ == '__main__': 150 if __name__ == '__main__':
147 sys.exit(main()) 151 sys.exit(main())
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698