From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 7 Jan 2008 20:56:54 +0000 (-0000)
Subject: When installing a binpkg make sure we record our own prefix, not the one of the binpk... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2e40ea7fa4296099e731526c3bb14e5a45f86b0c;p=portage.git

When installing a binpkg make sure we record our own prefix, not the one of the binpkg, as we adjusted the package accordingly.  (rebinpkging should work, though not really sensible)

svn path=/main/branches/prefix/; revision=9153
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index a91a5edf6..4515b2d9e 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5970,6 +5970,10 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes
 
 		# We want to install in "our" prefix, not the binary one
 		mysettings["EPREFIX"] = EPREFIX
+		# Store "our" prefix in the vdb.
+		fp = open(os.path.join(infloc, "EPREFIX"), "w")
+		fp.write(EPREFIX+"\n")
+		fp.close()
 
 		# Eventually we'd like to pass in the saved ebuild env here.
 		retval = doebuild(myebuild, "setup", myroot, mysettings, debug=debug,