| 1 |
commit: 5e15e5830a915c614cd81f6a87b2e73ac116368d |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 1 08:43:03 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 1 08:43:03 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5e15e583 |
| 7 |
|
| 8 |
merge: start at correct EPREFIX offset |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dbapi/vartree.py | 3 ++- |
| 12 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 15 |
index 0c0ed6a..70816b1 100644 |
| 16 |
--- a/pym/portage/dbapi/vartree.py |
| 17 |
+++ b/pym/portage/dbapi/vartree.py |
| 18 |
@@ -3872,7 +3872,8 @@ class dblink(object): |
| 19 |
|
| 20 |
# we do a first merge; this will recurse through all files in our srcroot but also build up a |
| 21 |
# "second hand" of symlinks to merge later |
| 22 |
- if self.mergeme(srcroot, destroot, outfile, secondhand, "", cfgfiledict, mymtime): |
| 23 |
+ if self.mergeme(srcroot, destroot, outfile, secondhand, |
| 24 |
+ self.settings["EPREFIX"].lstrip(os.sep), cfgfiledict, mymtime): |
| 25 |
return 1 |
| 26 |
|
| 27 |
# now, it's time for dealing our second hand; we'll loop until we can't merge anymore. The rest are |
Archives