OLD | NEW |
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 Loading... |
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()) |
OLD | NEW |