It helps a lot when you merge the actual "fixed" files by chpathtool

instead of those in the temporary unpack location.

svn path=/main/branches/prefix/; revision=8110

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 07bb72d3b2a742d23a5bab741825a737a9e62ba7..a2a38ff8786efa5b7149aac9ac49ca7dce876600 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5421,6 +5421,7 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes
                        if retval != os.EX_OK:
                                writemsg("!!! Adjusing to Prefix failed!\n", noiselevel=-1)
                                return retval
+                       pkgloc = os.path.join(builddir, "image")
 
                mylink = dblink(mycat, mypkg, myroot, mysettings, vartree=vartree,
                        treetype="bintree")