Fix typo in parallel_emerge which was breaking updates.

I put portage when I meant to put portage_pkg, so it was running
code unconditionally that should have only ran when portage was
being upgraded. Oops!

We also should clear the dependency list, since we don't want to
list dependencies other than portage when we're installing portage.

TBR=zbehan
TEST=parallel_emerge
BUG=none

Change-Id: Ic2861d78913f89fc42cedd96ffb125e08287f662

Review URL: http://codereview.chromium.org/3318009
This commit is contained in:
David James 2010-09-02 16:51:03 -07:00
parent a164ad46dd
commit 77076b4144

View File

@ -1653,7 +1653,9 @@ def main():
if root == "/":
for db_pkg in final_db.match_pkgs("sys-apps/portage"):
portage_pkg = deps_graph.get(db_pkg.cpv)
if portage and len(deps_graph) > 1:
if portage_pkg and len(deps_graph) > 1:
portage_pkg["needs"].clear()
portage_pkg["provides"].clear()
deps_graph = { str(db_pkg.cpv): portage_pkg }
portage_upgrade = True
if "--quiet" not in emerge.opts: