From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 27 Jun 2008 23:17:56 +0000 (-0000)
Subject: Break references from Package instances in the digraph before passing
X-Git-Tag: v2.2_rc2~304
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d6915be2072b42c0d8f97967606256bd2a1d2b63;p=portage.git

Break references from Package instances in the digraph before passing
it into the MergeTask constructor.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 6dc8d5abf..4b00d2099 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -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