| 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 base64 | 10 import base64 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 | 118 |
| 119 return gsutil_bin | 119 return gsutil_bin |
| 120 | 120 |
| 121 | 121 |
| 122 def run_gsutil(force_version, fallback, target, args): | 122 def run_gsutil(force_version, fallback, target, args): |
| 123 if force_version: | 123 if force_version: |
| 124 gsutil_bin = ensure_gsutil(force_version, target) | 124 gsutil_bin = ensure_gsutil(force_version, target) |
| 125 else: | 125 else: |
| 126 gsutil_bin = fallback | 126 gsutil_bin = fallback |
| 127 cmd = [sys.executable, gsutil_bin] + args | 127 cmd = [sys.executable, gsutil_bin] + args |
| 128 call(cmd) | 128 os.execv(cmd[0], 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, extras = parser.parse_known_args() | 138 args, extras = parser.parse_known_args() |
| 139 if args.args and args.args[0] == '--': | 139 if args.args and args.args[0] == '--': |
| 140 args.args.pop(0) | 140 args.args.pop(0) |
| 141 if extras: | 141 if extras: |
| 142 args.args = extras + args.args | 142 args.args = extras + args.args |
| 143 return args.force_version, args.fallback, args.target, args.args | 143 return args.force_version, args.fallback, args.target, args.args |
| 144 | 144 |
| 145 | 145 |
| 146 def main(): | 146 def main(): |
| 147 force_version, fallback, target, args = parse_args() | 147 force_version, fallback, target, args = parse_args() |
| 148 run_gsutil(force_version, fallback, target, args) | 148 run_gsutil(force_version, fallback, target, args) |
| 149 | 149 |
| 150 if __name__ == '__main__': | 150 if __name__ == '__main__': |
| 151 sys.exit(main()) | 151 sys.exit(main()) |
| OLD | NEW |