diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-12 05:57:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-12 05:57:07 +0000 |
| commit | f77d0db5730489e02352a5e8f94d882b2db6b0c1 (patch) | |
| tree | e634b3121ee46dfb8a1657a1ed13c55b8486acda /bin | |
| parent | 923bb28674e38db1730d620ea6c2f9505e43f45a (diff) | |
| download | portage-f77d0db5730489e02352a5e8f94d882b2db6b0c1.tar.gz portage-f77d0db5730489e02352a5e8f94d882b2db6b0c1.tar.bz2 portage-f77d0db5730489e02352a5e8f94d882b2db6b0c1.zip | |
Make dyn_clean ignore FEATURES=keepwork when [[ $EMERGE_FROM = binary ]]
and remove shutil.rmtree() call from Binpkg._clean_exit() since dyn_clean
is guaranteed to do a full clean now. (trunk r13069)
svn path=/main/branches/2.1.6/; revision=13083
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 23f1c447f..b75dfc098 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -712,11 +712,12 @@ dyn_clean() { rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir" rm -f "${PORTAGE_BUILDDIR}/.installed" - if ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then + if [[ $EMERGE_FROM = binary ]] || \ + ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then rm -rf "${T}" fi - if ! hasq keepwork $FEATURES; then + if [[ $EMERGE_FROM = binary ]] || ! hasq keepwork $FEATURES; then rm -f "$PORTAGE_BUILDDIR"/.{exit_status,logid,unpacked,prepared} \ "$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} |