From 5e15e5830a915c614cd81f6a87b2e73ac116368d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 1 Sep 2011 01:43:03 -0700 Subject: merge: start at correct EPREFIX offset --- pym/portage/dbapi/vartree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 0c0ed6a64..70816b145 100644 --- 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 -- cgit v1.2.3-1-g7c22