merge: start at correct EPREFIX offset

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 0c0ed6a64b15f23977004ea9f687e9912fb7965f..70816b14522a117127e55c4a7175f0e7d3a978d0 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3872,7 +3872,8 @@ class dblink(object):
 
                # we do a first merge; this will recurse through all files in our srcroot but also build up a
                # "second hand" of symlinks to merge later
-               if self.mergeme(srcroot, destroot, outfile, secondhand, "", cfgfiledict, mymtime):
+               if self.mergeme(srcroot, destroot, outfile, secondhand,
+                       self.settings["EPREFIX"].lstrip(os.sep), cfgfiledict, mymtime):
                        return 1
 
                # now, it's time for dealing our second hand; we'll loop until we can't merge anymore.  The rest are