| 1 |
commit: f736935de2bb1370524302d9cfe915c16d922bb9 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 3 21:52:20 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 3 21:52:20 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f736935d |
| 7 |
|
| 8 |
emerge: more helpful "non-existent set" message |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/main.py | 6 ++++++ |
| 12 |
1 files changed, 6 insertions(+), 0 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 15 |
index 3540138..2a0e67f 100644 |
| 16 |
--- a/pym/_emerge/main.py |
| 17 |
+++ b/pym/_emerge/main.py |
| 18 |
@@ -1494,6 +1494,12 @@ def expand_set_arguments(myfiles, myaction, root_config): |
| 19 |
writemsg_level(("emerge: the given set '%s' " + \ |
| 20 |
"contains a non-existent set named '%s'.\n") % \ |
| 21 |
(s, e), level=logging.ERROR, noiselevel=-1) |
| 22 |
+ if s in ('world', 'selected') and \ |
| 23 |
+ SETPREFIX + e.value in sets['selected']: |
| 24 |
+ writemsg_level(("Use `emerge --deselect %s%s` to " |
| 25 |
+ "remove this set from world_sets.\n") % |
| 26 |
+ (SETPREFIX, e,), level=logging.ERROR, |
| 27 |
+ noiselevel=-1) |
| 28 |
return (None, 1) |
| 29 |
if myaction in unmerge_actions and \ |
| 30 |
not sets[s].supportsOperation("unmerge"): |
Archives