diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-09-06 04:48:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-09-06 04:48:10 +0000 |
| commit | dd0b4ff411b827d183b02cca6fcc70ae765eb3c3 (patch) | |
| tree | 4ecce6a6efd64aba3954c36e5ff6b84018459ad8 | |
| parent | 6d0c61651262bb9032f4738ad0404c615b03e873 (diff) | |
| download | portage-dd0b4ff411b827d183b02cca6fcc70ae765eb3c3.tar.gz portage-dd0b4ff411b827d183b02cca6fcc70ae765eb3c3.tar.bz2 portage-dd0b4ff411b827d183b02cca6fcc70ae765eb3c3.zip | |
if user has FEATURES=noauto then dont check lame .installed file
svn path=/main/trunk/; revision=4411
| -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 6dda415bd..d2a40c350 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -994,7 +994,9 @@ dyn_test() { dyn_install() { [ -z "$PORTAGE_BUILDDIR" ] && die "${FUNCNAME}: PORTAGE_BUILDDIR is unset" - if [ "${PORTAGE_BUILDDIR}/.installed" -nt "${WORKDIR}" ]; then + if hasq noauto $FEATURES ; then + rm -f "${PORTAGE_BUILDDIR}/.installed" + elif [[ ${PORTAGE_BUILDDIR}/.installed -nt ${WORKDIR} ]] ; then vecho ">>> It appears that '${PF}' is already installed; skipping." vecho ">>> Remove '${PORTAGE_BUILDDIR}/.installed' to force install." return 0 |