From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SmB1j-0002su-Mh for garchives@archives.gentoo.org; Tue, 03 Jul 2012 21:52:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 008CAE05F9; Tue, 3 Jul 2012 21:52:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C8C85E05F9 for ; Tue, 3 Jul 2012 21:52:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D69991B401D for ; Tue, 3 Jul 2012 21:52:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9FDB2E5436 for ; Tue, 3 Jul 2012 21:52:35 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1341352340.f736935de2bb1370524302d9cfe915c16d922bb9.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f736935de2bb1370524302d9cfe915c16d922bb9 X-VCS-Branch: master Date: Tue, 3 Jul 2012 21:52:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4f032519-033f-49f3-894c-229446b57ddc X-Archives-Hash: 5a3b65058eeed1c990c482f6aa924a58 commit: f736935de2bb1370524302d9cfe915c16d922bb9 Author: Zac Medico gentoo org> AuthorDate: Tue Jul 3 21:52:20 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jul 3 21:52:20 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df736935d emerge: more helpful "non-existent set" message --- pym/_emerge/main.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 3540138..2a0e67f 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1494,6 +1494,12 @@ def expand_set_arguments(myfiles, myaction, root_c= onfig): writemsg_level(("emerge: the given set '%s' " + \ "contains a non-existent set named '%s'.\n") % \ (s, e), level=3Dlogging.ERROR, noiselevel=3D-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=3Dlogging.ERROR, + noiselevel=3D-1) return (None, 1) if myaction in unmerge_actions and \ not sets[s].supportsOperation("unmerge"):