diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-10 03:08:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-10 03:08:40 +0000 |
| commit | 20491fc68d7021e7bd9c4b22755ddac960b09e5e (patch) | |
| tree | 2524bd6420da273e5c18ce6d53291a621c9dad79 /pym/_emerge/depgraph.py | |
| parent | f25216e8015b231ff719c1859e3e1ca20965f216 (diff) | |
| download | portage-20491fc68d7021e7bd9c4b22755ddac960b09e5e.tar.gz portage-20491fc68d7021e7bd9c4b22755ddac960b09e5e.tar.bz2 portage-20491fc68d7021e7bd9c4b22755ddac960b09e5e.zip | |
Revert the rest of the package sets related code and docs, to behave like the
2.1.6 branch.
svn path=/main/branches/2.1.7/; revision=14549
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 9938a72c6..175cf4f19 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3772,7 +3772,7 @@ class depgraph(object): if not parent_atoms: atom = self._dynamic_config._blocked_world_pkgs.get(pkg) if atom is not None: - parent_atoms = set([("@world", atom)]) + parent_atoms = set([("world", atom)]) if parent_atoms: conflict_pkgs[pkg] = parent_atoms |