diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-26 19:02:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-26 19:02:05 +0000 |
| commit | 9794d481c67bb84eedc583e813ba079fcb7cbc08 (patch) | |
| tree | 0ad35f7cc68e14e24bd2f95cf52158aa12e7d13f /bin | |
| parent | 6e62223fe876d75c0e4f3e1cfcc33fa94e2cdaa6 (diff) | |
| download | portage-9794d481c67bb84eedc583e813ba079fcb7cbc08.tar.gz portage-9794d481c67bb84eedc583e813ba079fcb7cbc08.tar.bz2 portage-9794d481c67bb84eedc583e813ba079fcb7cbc08.zip | |
* In doebuild(), don't create directories for the "clean" or "unmerge".
* Fix dyn_clean() to clean the status file and return early when appropriate.
svn path=/main/trunk/; revision=8692
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b8ca584d4..9c4436697 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -659,8 +659,9 @@ dyn_clean() { if [ -z "${PORTAGE_BUILDDIR}" ]; then echo "Aborting clean phase because PORTAGE_BUILDDIR is unset!" return 1 + elif [ ! -d "${PORTAGE_BUILDDIR}" ] ; then + return 0 fi - if type -P chflags > /dev/null ; then chflags -R noschg,nouchg,nosappnd,nouappnd "${PORTAGE_BUILDDIR}" chflags -R nosunlnk,nouunlnk "${PORTAGE_BUILDDIR}" 2>/dev/null @@ -675,6 +676,7 @@ dyn_clean() { fi if ! hasq keepwork $FEATURES; then + rm -rf "${PORTAGE_BUILDDIR}/.exit_status" rm -rf "${PORTAGE_BUILDDIR}/.logid" rm -rf "${PORTAGE_BUILDDIR}/.unpacked" rm -rf "${PORTAGE_BUILDDIR}/.compiled" |