diff options
| author | cpilch <cpilch@google.com> | 2017-03-30 22:17:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-30 22:17:09 +0000 |
| commit | c8c917e6ee61f4df27b8734d722cbdc7c84e3d87 (patch) | |
| tree | b6a9fd70a8c242956d555f71a0a2689e9cdea59d | |
| parent | dca103ca598b3b84859851dd377b80288367108f (diff) | |
| parent | 3108f3d59c0f624375be3c44195b904c701e4b99 (diff) | |
| download | adt-infra-c8c917e6ee61f4df27b8734d722cbdc7c84e3d87.tar.gz | |
Adds a checkout command to annotated_run.py am: 0254b1cc20
am: 3108f3d59c
Change-Id: I21285ff09005f5520ff7c31bc58c7d572f559157
| -rwxr-xr-x | build/scripts/slave/annotated_run.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/scripts/slave/annotated_run.py b/build/scripts/slave/annotated_run.py index b1ab163b..b51b2bb0 100755 --- a/build/scripts/slave/annotated_run.py +++ b/build/scripts/slave/annotated_run.py @@ -182,8 +182,9 @@ def update_scripts(): git_cmd = 'git.bat' if os.name == "nt" else 'git' with stream.step('update_scripts') as s: fetch_cmd = [git_cmd, 'fetch', '--all'] - reset_cmd = [git_cmd, 'reset', '--hard', 'origin/master'] - if subprocess.call(fetch_cmd) != 0 or subprocess.call(reset_cmd) != 0: + reset_cmd = [git_cmd, 'reset', '--hard', 'origin/emu-master-dev'] + checkout_cmd = [git_cmd, 'checkout', 'emu-master-dev'] + if subprocess.call(fetch_cmd) != 0 or subprocess.call(reset_cmd) != 0 or subprocess.call(checkout_cmd) != 0: s.step_text('git update source failed!') s.step_warnings() s.step_text('git pull') |