summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-13 17:05:16 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-13 17:05:16 -0700
commit063f8a597647da0ba9b3a421fd2b74dffd39a6cc (patch)
treee1797b2da7c462f54a87f2b8a593066c47a2f969
parentef98d53989ed79e668d9ebfd06bd2aca69412c1f (diff)
downloadportage-063f8a597647da0ba9b3a421fd2b74dffd39a6cc.tar.gz
portage-063f8a597647da0ba9b3a421fd2b74dffd39a6cc.tar.bz2
portage-063f8a597647da0ba9b3a421fd2b74dffd39a6cc.zip
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().
-rw-r--r--pym/portage/package/ebuild/config.py6
1 files changed, 6 insertions, 0 deletions
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):