From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 12 Jan 2009 08:32:05 +0000 (-0000)
Subject: Replace @world with plain 'world'.
X-Git-Tag: v2.1.6.5~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ecb95015b3d2b0632a33c206e648f7fd60e1ba11;p=portage.git

Replace @world with plain 'world'.

svn path=/main/branches/2.1.6/; revision=12483
---

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