From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 14 Sep 2010 00:05:16 +0000 (-0700)
Subject: Make config.setinst() and get_virts_p() call getvirtuals() in order
X-Git-Tag: v2.2_rc82~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=063f8a597647da0ba9b3a421fd2b74dffd39a6cc;p=portage.git

Make config.setinst() and get_virts_p() call getvirtuals() in order
to ensure that we don't trigger the _treeVirtuals assertion in
VirtualsManager._compile_virtuals().
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index fe2cc5497..d920b7e20 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1754,6 +1754,9 @@ class config(object):
 			myuse = mydbapi.aux_get(mycpv, ["USE"])[0]
 		virts = use_reduce(provides, uselist=myuse.split(), flat=True)
 
+		# Ensure that we don't trigger the _treeVirtuals
+		# assertion in VirtualsManager._compile_virtuals().
+		self.getvirtuals()
 		self._virtuals_manager.add_depgraph_virtuals(mycpv, virts)
 
 	def reload(self):
@@ -2001,6 +2004,9 @@ class config(object):
 		return self.getvirtuals()
 
 	def get_virts_p(self):
+		# Ensure that we don't trigger the _treeVirtuals
+		# assertion in VirtualsManager._compile_virtuals().
+		self.getvirtuals()
 		return self._virtuals_manager.get_virts_p()
 
 	def getvirtuals(self):