diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-28 19:06:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-28 19:06:01 +0000 |
| commit | 18e09003bc01cadea64be0e8a95aae4114bdeff2 (patch) | |
| tree | 4fdd86977867dc7a202bb812ccc3a44477b812f6 | |
| parent | ce9606b6e628239d3fe3323f7ed143e831d6d0f1 (diff) | |
| download | portage-18e09003bc01cadea64be0e8a95aae4114bdeff2.tar.gz portage-18e09003bc01cadea64be0e8a95aae4114bdeff2.tar.bz2 portage-18e09003bc01cadea64be0e8a95aae4114bdeff2.zip | |
Make sure we doebuild uses the correct tree for fetch lists when there are overlays.
svn path=/main/trunk/; revision=4047
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index 6899ef8a6..c32cb62b2 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2709,9 +2709,13 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, mycpv = "/".join((mysettings["CATEGORY"], mysettings["PF"])) - newuris, alist = mydbapi.getfetchlist(mycpv, mysettings=mysettings) + # Make sure we get the correct tree in case there are overlays. + mytree = os.path.realpath( + os.path.dirname(os.path.dirname(mysettings["O"]))) + newuris, alist = mydbapi.getfetchlist( + mycpv, mytree=mytree, mysettings=mysettings) alluris, aalist = mydbapi.getfetchlist( - mycpv, mysettings=mysettings, all=True) + mycpv, mytree=mytree, all=True, mysettings=mysettings) mysettings["A"] = " ".join(alist) mysettings["AA"] = " ".join(aalist) if ("mirror" in features) or fetchall: |