diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-01-08 03:08:34 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-01-08 03:08:34 +0000 |
| commit | 454a12a8030b82127d24d3b23c3bccc4870f6b60 (patch) | |
| tree | 75ea9fb10deee631d3f329734666a1f852dbd5bc | |
| parent | merged make.conf changes from HEAD. (diff) | |
| download | portage-cvs-454a12a8030b82127d24d3b23c3bccc4870f6b60.tar.gz portage-cvs-454a12a8030b82127d24d3b23c3bccc4870f6b60.tar.bz2 portage-cvs-454a12a8030b82127d24d3b23c3bccc4870f6b60.zip | |
Moved the "true" to the end of the dyn_clean() function.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | bin/ebuild.sh | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -1,12 +1,15 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.796.2.42 2005/01/06 14:30:09 jstubbs Exp $ +# $Id: ChangeLog,v 1.796.2.43 2005/01/08 03:08:34 jstubbs Exp $ MAJOR CHANGES in 2.0.51: 1. /var/cache/edb/virtuals is no longer used at all. It's calculated now. 2. /var/cache/edb/world is now /var/lib/portage/world. 3. /etc/portage/profile/virtuals is _USER_ configs only. + 08 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> ebuild.sh: Moved the "true" to + the end of the dyn_clean() function. + 06 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> ebuild.sh: Added eradicator's multilib-strict patch, which allows checking and failing if binaries are about to be installed into an incorrect directory. The feature is configured diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b450446..a262b6f 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.13 2005/01/06 14:30:09 jstubbs Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.14 2005/01/08 03:08:34 jstubbs Exp $ export SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/usr/lib/portage/pym:/dev/random" export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:${PORTAGE_TMPDIR}" @@ -684,11 +684,11 @@ dyn_clean() { if [ -f "${BUILDDIR}/.unpacked" ]; then find "${BUILDDIR}" -type d ! -regex "^${WORKDIR}" | sort -r | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null fi - true if [ -z "$(find "${BUILDDIR}" -mindepth 1 -maxdepth 1)" ]; then rmdir "${BUILDDIR}" fi + true } into() { |