diff options
| author | Yunlian Jiang <yunlian@google.com> | 2013-05-23 13:14:25 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-05-23 15:58:49 -0700 |
| commit | f00adba7fe33c50b1522e6c784de4c4ecd4bf611 (patch) | |
| tree | 3093332328af808437ea232365777eb9ebdcc6ce /remote_gcc_build.py | |
| parent | e5b673f1b459a0927ca65bf9e6fd504ece57e39d (diff) | |
| download | toolchain-utils-f00adba7fe33c50b1522e6c784de4c4ecd4bf611.tar.gz | |
remote_gcc_build: fix branch setting error.
This fixes the error when a version is given, the branch
it empty, it invokes the cbuildbot in a wrong way.
BUG=None
TEST=./remote_gcc_build.py -t lumpy-release -c ~/clang -p 51046
-d ~/local_tmp -r --chromeos_version R29-4165.0.0 passes.
Change-Id: I75e24dc1c820583ecb0a10183d9bc86bdec50fbb
Reviewed-on: https://gerrit-int.chromium.org/38595
Commit-Queue: Yunlian Jiang <yunlian@google.com>
Reviewed-by: Yunlian Jiang <yunlian@google.com>
Tested-by: Yunlian Jiang <yunlian@google.com>
Diffstat (limited to 'remote_gcc_build.py')
| -rwxr-xr-x | remote_gcc_build.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remote_gcc_build.py b/remote_gcc_build.py index 0f374a76..ad6be7b1 100755 --- a/remote_gcc_build.py +++ b/remote_gcc_build.py @@ -391,6 +391,8 @@ def Main(argv): patch = [] chromeos_root = misc.CanonicalizePath(args.chromeos_root) branch = args.branch + if not branch: + branch = chromeos_version # descritption is the keyword of the build in build log. # Here we use [{branch)_{patchnumber}_{target}] description = "{0}_{1}_{2}".format(branch, GetPatchString(patch), target) @@ -407,8 +409,6 @@ def Main(argv): chromeos_root) patch.append(manifest_patch) if args.gcc_dir: - if not branch: - branch = chromeos_version patch.append(UploadGccPatch(chromeos_root, args.gcc_dir, branch)) index = 0 description = RunRemote(chromeos_root, branch, patch, args.local, |