diff options
| author | Mike Frysinger <vapier@chromium.org> | 2012-08-06 14:36:05 -0400 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-08-06 18:55:03 -0700 |
| commit | 0a647fc12a887c12018af6c283b690e8cb9ecd6f (patch) | |
| tree | 3064cebf5a50ff9343eb8d237b17715b64907691 /scripts/cros_mark_as_stable.py | |
| parent | b0e4bc9355ee107bc264ecd0ed7fad0b62041afd (diff) | |
| download | chromite-0a647fc12a887c12018af6c283b690e8cb9ecd6f.tar.gz | |
parallel_emerge/cros_mark_as_stable: fix CLEAN_DELAY handling
The UNMERGE_DELAY variable was last seen in the portage code base in
2006. All current code I can find refers to CLEAN_DELAY, so change
parallel emerge to use the new variable name.
Further, improve cros_mark_as_stable to not wait 5 seconds when
cleaning out packages by setting CLEAN_DELAY.
BUG=None
TEST=`cbuildbot arm-tegra2-paladin` no longer shows delay count down
Change-Id: Id3c44f91c5f70ca4a59ee600ccfae14c8485758e
Reviewed-on: https://gerrit.chromium.org/gerrit/29303
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/cros_mark_as_stable.py')
| -rw-r--r-- | scripts/cros_mark_as_stable.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/cros_mark_as_stable.py b/scripts/cros_mark_as_stable.py index 00940b374..f9e1dbae5 100644 --- a/scripts/cros_mark_as_stable.py +++ b/scripts/cros_mark_as_stable.py @@ -59,7 +59,8 @@ def CleanStalePackages(boards, package_atoms): runcmd = cros_build_lib.SudoRunCommand if package_atoms: - runcmd(['emerge' + suffix, '-q', '--unmerge'] + package_atoms); + runcmd(['emerge' + suffix, '-q', '--unmerge'] + package_atoms, + extra_env={'CLEAN_DELAY': '0'}) runcmd(['eclean' + suffix, '-d', 'packages'], redirect_stdout=True, redirect_stderr=True) |