From a39124fb6af38c7bd00f09556490fe8f15e8f84c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 6 Jul 2007 23:07:01 +0000 Subject: When depgraph updates preferences for old-style virtuals, also update them in the global config so that they are consistent everywhere. Optimize config.setinst() to minimize the work done. (trunk r7185) svn path=/main/branches/2.1.2/; revision=7186 --- bin/emerge | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 011b0469a..9f1c34472 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1745,9 +1745,14 @@ class depgraph: if p_status == "merge": # Update old-style virtuals if this package provides any. # These are needed for dep_virtual calls inside dep_check. - p_db = self.trees[p_root][self.pkg_tree_map[p_type]].dbapi + p_db = self.mydbapi[p_root] # contains cached metadata try: self.pkgsettings[p_root].setinst(p_key, p_db) + # For consistency, also update the global virtuals. + settings = self.roots[p_root].settings + settings.unlock() + settings.setinst(p_key, p_db) + settings.lock() except portage_exception.InvalidDependString, e: provide = p_db.aux_get(p_key, ["PROVIDE"])[0] show_invalid_depstring_notice(myparent, provide, str(e)) -- cgit v1.2.3-1-g7c22