From 18e09003bc01cadea64be0e8a95aae4114bdeff2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Jul 2006 19:06:01 +0000 Subject: Make sure we doebuild uses the correct tree for fetch lists when there are overlays. svn path=/main/trunk/; revision=4047 --- pym/portage.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pym/portage.py') 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: -- cgit v1.2.3-1-g7c22