summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/__init__.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-12 08:32:05 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-12 08:32:05 +0000
commitecb95015b3d2b0632a33c206e648f7fd60e1ba11 (patch)
tree100ecd6796869a2b9ae165f816be9ca7d737a9d9 /pym/_emerge/__init__.py
parent3f0955745d08089375c578f58619f8aa41ea0ef1 (diff)
downloadportage-ecb95015b3d2b0632a33c206e648f7fd60e1ba11.tar.gz
portage-ecb95015b3d2b0632a33c206e648f7fd60e1ba11.tar.bz2
portage-ecb95015b3d2b0632a33c206e648f7fd60e1ba11.zip
Replace @world with plain 'world'.
svn path=/main/branches/2.1.6/; revision=12483
Diffstat (limited to 'pym/_emerge/__init__.py')
-rw-r--r--pym/_emerge/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 45e9c2a35..2a2ded8dd 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -7343,7 +7343,7 @@ class depgraph(object):
if not parent_atoms:
atom = self._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