[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/, pym/portage/package/ebuild/

[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/, pym/portage/package/ebuild/

[Zac Medico]

commit:     de9a536f470919651e83ece51923594e8605781b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 01:09:20 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 01:09:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=de9a536f

doins: tweak $DISTDIR symlink handling

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

---
 bin/ebuild-helpers/doins               |    5 +++--
 pym/portage/package/ebuild/doebuild.py |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 3daa9a0..bcef311 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 3d03171..f353166 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