diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-20 07:19:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-20 07:19:35 +0000 |
| commit | 8dffd77c86a22e0d574b0c3d15cefb7fb376ca33 (patch) | |
| tree | be053dbb01d9ec17199caf13e1f153c5622d2b70 | |
| parent | eaa60cb097683a80eeabdb2140a7a88302e6c288 (diff) | |
| download | portage-8dffd77c86a22e0d574b0c3d15cefb7fb376ca33.tar.gz portage-8dffd77c86a22e0d574b0c3d15cefb7fb376ca33.tar.bz2 portage-8dffd77c86a22e0d574b0c3d15cefb7fb376ca33.zip | |
Remove the config.setinst() call from depgraph.select_dep()
since it's never really guaranteed to work as intended. It's
supposed to help ensure that the correct old-style virtual
is preferred but it will often fail to do so, making it
necessary for the user to manually force the preference.
Proper backtracking (bug #1343) will solve the problem more
reliably.
svn path=/main/trunk/; revision=8186
| -rw-r--r-- | pym/_emerge/__init__.py | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 6519bc12d..000e74d9e 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1840,34 +1840,6 @@ class depgraph(object): if depstring in self._set_atoms: self._pprovided_args.append((arg, depstring)) - if myparent: - # The parent is added after it's own dep_check call so that it - # isn't allowed to satisfy a direct bootstrap dependency on itself - # via an old-style virtual. This isn't a problem with new-style - # virtuals, which are preferenced in dep_zapdeps by looking only at - # the depstring, vdb, and available packages. - - p_type, p_root, p_key, p_status = myparent - 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.mydbapi[p_root] # contains cached metadata - if myparent in self._slot_collision_nodes: - # The metadata isn't cached due to the slot collision. - p_db = self.trees[p_root][self.pkg_tree_map[p_type]].dbapi - 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)) - del e - return 0 - if "--debug" in self.myopts: print "Candidates:",mymerge for x in mymerge: |