diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2020-10-22 06:32:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-22 06:32:58 +0000 |
| commit | 12fcdf982e5199bb0f830898765cdbe61c62badf (patch) | |
| tree | 073e9e403bc6e2290b2b5b005a5cfdabadde1e42 /cros_utils/misc.py | |
| parent | 740c99ffa8d6b5197e1bd99af4863a7ac810f8a0 (diff) | |
| parent | 1e576757bc040ab78407dea41218ed640277fc11 (diff) | |
| download | toolchain-utils-12fcdf982e5199bb0f830898765cdbe61c62badf.tar.gz | |
Merging 84 commit(s) from Chromium's toolchain-utils am: 1e576757bc
Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/1469797
Change-Id: I9b1cd41e1cd7d67b963f80c582431b9516bf474f
Diffstat (limited to 'cros_utils/misc.py')
| -rw-r--r-- | cros_utils/misc.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cros_utils/misc.py b/cros_utils/misc.py index b4beb60c..93d1b3b6 100644 --- a/cros_utils/misc.py +++ b/cros_utils/misc.py @@ -24,12 +24,15 @@ CHROMEOS_SCRIPTS_DIR = '/mnt/host/source/src/scripts' TOOLCHAIN_UTILS_PATH = ('/mnt/host/source/src/third_party/toolchain-utils/' 'cros_utils/toolchain_utils.sh') +CROS_MAIN_BRANCH = 'cros/master' + def GetChromeOSVersionFromLSBVersion(lsb_version): """Get Chromeos version from Lsb version.""" ce = command_executer.GetCommandExecuter() command = ('git ls-remote ' - 'https://chromium.googlesource.com/chromiumos/manifest.git') + 'https://chromium.googlesource.com/chromiumos/manifest.git ' + 'refs/heads/release-R*') ret, out, _ = ce.RunCommandWOutput(command, print_to_console=False) assert ret == 0, 'Command %s failed' % command lower = [] @@ -444,8 +447,9 @@ def DeleteChromeOsTree(chromeos_root, dry_run=False): cmd1, print_to_console=True) == 0 -def ApplyGerritPatches(chromeos_root, gerrit_patch_string, - branch='cros/master'): +def ApplyGerritPatches(chromeos_root, + gerrit_patch_string, + branch=CROS_MAIN_BRANCH): """Apply gerrit patches on a chromeos tree. Args: |