diff options
| author | Mike Frysinger <vapier@chromium.org> | 2012-07-16 14:57:24 -0400 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-07-17 09:50:00 -0700 |
| commit | 303083dc69abffb1c2c7a4742df5eeb9763fe7f2 (patch) | |
| tree | 2cfcca9618e330394f6186f55ffe8fe9af82ac30 /scripts | |
| parent | 7fbf2d4de762cda7fe7c0af48f509404213b85bf (diff) | |
| download | chromite-303083dc69abffb1c2c7a4742df5eeb9763fe7f2.tar.gz | |
cros_mark_as_stable: always setup stabilization branch when committing
We need the stabilization branch in order to commit our updated cache
files, so always set that branch up even if we don't have any ebuilds
to work on. If there ends up not being any work, and we don't update
any cache files, it'll just get thrown away.
BUG=None
TEST=`./buildbot/run_tests` passes
TEST=`cros-cbuildbot --local arm-tegra2-paladin` and look at local branches after it finishes
Change-Id: I4e5bece8aae6d59ba894f181266ee81f45db8efb
Reviewed-on: https://gerrit.chromium.org/gerrit/27530
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cros_mark_as_stable.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/cros_mark_as_stable.py b/scripts/cros_mark_as_stable.py index beebccd56..00940b374 100644 --- a/scripts/cros_mark_as_stable.py +++ b/scripts/cros_mark_as_stable.py @@ -288,7 +288,7 @@ def main(argv): if command == 'push': PushChange(constants.STABLE_EBUILD_BRANCH, tracking_branch, options.dryrun, cwd=overlay) - elif command == 'commit' and ebuilds: + elif command == 'commit': existing_branch = cros_build_lib.GetCurrentBranch(overlay) work_branch = GitBranch(constants.STABLE_EBUILD_BRANCH, tracking_branch, cwd=overlay) @@ -316,7 +316,6 @@ def main(argv): 'and reset the git repo yourself.' % overlay) raise - if command == 'commit': # Regenerate caches if need be. We do this all the time to # catch when users make changes without updating cache files. cache_queue.put([overlay]) |