From 77076b4144e9251a59122d46f192a1d47515621a Mon Sep 17 00:00:00 2001 From: David James Date: Thu, 2 Sep 2010 16:51:03 -0700 Subject: [PATCH] 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 --- parallel_emerge | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/parallel_emerge b/parallel_emerge index ae02a14b25..3f9bbd1b4d 100755 --- a/parallel_emerge +++ b/parallel_emerge @@ -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: