Break references from Package instances in the digraph before passing
authorZac Medico <zmedico@gentoo.org>
Fri, 27 Jun 2008 23:17:56 +0000 (23:17 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 27 Jun 2008 23:17:56 +0000 (23:17 -0000)
it into the MergeTask constructor.

svn path=/main/trunk/; revision=10821

pym/_emerge/__init__.py

index 6dc8d5abfed14506d7f6d5cad649d9fcf1f985d4..4b00d209971520d8c3febbf9f5ef80a040f0cd15 100644 (file)
@@ -8909,6 +8909,7 @@ def action_build(settings, trees, mtimedb,
                                time.sleep(3) # allow the parent to have first fetch
                        mymergelist = mydepgraph.altlist()
                        mydepgraph.break_refs(mymergelist)
+                       mydepgraph.break_refs(mydepgraph.digraph.order)
                        mergetask = MergeTask(settings, trees, mtimedb, myopts,
                                spinner, mymergelist, favorites, mydepgraph.digraph)
                        del mydepgraph
@@ -8955,6 +8956,7 @@ def action_build(settings, trees, mtimedb,
                        pkglist = mydepgraph.altlist()
                        mydepgraph.saveNomergeFavorites()
                        mydepgraph.break_refs(pkglist)
+                       mydepgraph.break_refs(mydepgraph.digraph.order)
                        mergetask = MergeTask(settings, trees, mtimedb, myopts,
                                spinner, pkglist, favorites, mydepgraph.digraph)
                        del mydepgraph