From: Fabian Groffen Date: Sat, 13 Oct 2007 13:26:01 +0000 (-0000) Subject: It helps a lot when you merge the actual "fixed" files by chpathtool X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=58b9f3cb413cce8bd31e903c6d71f12447d05207;p=portage.git 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 07bb72d3b..a2a38ff87 100644 --- 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")