From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 3 Jul 2012 21:52:20 +0000 (-0700)
Subject: emerge: more helpful "non-existent set" message
X-Git-Tag: v2.2.0_alpha116~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f736935de2bb1370524302d9cfe915c16d922bb9;p=portage.git

emerge: more helpful "non-existent set" message
---

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 35401383f..2a0e67f1d 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1494,6 +1494,12 @@ def expand_set_arguments(myfiles, myaction, root_config):
 					writemsg_level(("emerge: the given set '%s' " + \
 						"contains a non-existent set named '%s'.\n") % \
 						(s, e), level=logging.ERROR, noiselevel=-1)
+					if s in ('world', 'selected') and \
+						SETPREFIX + e.value in sets['selected']:
+						writemsg_level(("Use `emerge --deselect %s%s` to "
+							"remove this set from world_sets.\n") %
+							(SETPREFIX, e,), level=logging.ERROR,
+							noiselevel=-1)
 					return (None, 1)
 				if myaction in unmerge_actions and \
 						not sets[s].supportsOperation("unmerge"):