diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-01 01:43:03 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-01 01:43:03 -0700 |
| commit | 5e15e5830a915c614cd81f6a87b2e73ac116368d (patch) | |
| tree | 16c4c7686eb45008cd98f7283568ce04c85a9ad7 /pym/portage | |
| parent | 806b8431c600bbeb7831a4ec200a599d215cd4e0 (diff) | |
| download | portage-5e15e5830a915c614cd81f6a87b2e73ac116368d.tar.gz portage-5e15e5830a915c614cd81f6a87b2e73ac116368d.tar.bz2 portage-5e15e5830a915c614cd81f6a87b2e73ac116368d.zip | |
merge: start at correct EPREFIX offset
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |