From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 12 Apr 2011 01:09:20 +0000 (-0700)
Subject: doins: tweak $DISTDIR symlink handling
X-Git-Tag: v2.1.9.46~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=348d395e2d759abc573dabfc40339786c72267f6;p=portage.git

doins: tweak $DISTDIR symlink handling

Only match stuff inside $PORTAGE_ACTUAL_DISTDIR/ so that we don't
stray from PMS.
---

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 3daa9a01a..bcef3118f 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -59,9 +59,10 @@ _doins() {
 		# not be reproduced inside $D. In order to ensure
 		# that things like dodoc "$DISTDIR"/foo.pdf work
 		# as expected, we dereference symlinked files that
-		# are referenced by absolute paths.
+		# refer to absolute paths inside
+		# $PORTAGE_ACTUAL_DISTDIR/.
 		if [ $PRESERVE_SYMLINKS = y ] && \
-			! [[ -f "$mysrc" && $(readlink "$mysrc") == /* ]] ; then
+			! [[ $(readlink "$mysrc") == "$PORTAGE_ACTUAL_DISTDIR"/* ]] ; then
 			rm -rf "$D$INSDESTTREE/$mydir/${mysrc##*/}" || return $?
 			cp -P "$mysrc" "$D$INSDESTTREE/$mydir/${mysrc##*/}"
 			return $?
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 3d0317160..f353166d7 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -786,7 +786,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 		# remove PORTAGE_ACTUAL_DISTDIR once cvs/svn is supported via SRC_URI
 		if tree == 'porttree' and \
 			((mydo != "setup" and "noauto" not in features) \
-			or mydo == "unpack"):
+			or mydo in ("install", "unpack")):
 			_prepare_fake_distdir(mysettings, alist)
 
 		#initial dep checks complete; time to process main commands