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.60) (envelope-from ) id 1QgiRv-0000UD-FD for garchives@archives.gentoo.org; Tue, 12 Jul 2011 19:16:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37D0D21C02D; Tue, 12 Jul 2011 19:16:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E5FF521C02D for ; Tue, 12 Jul 2011 19:16:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 568B72AC214 for ; Tue, 12 Jul 2011 19:16:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5B8268003D for ; Tue, 12 Jul 2011 19:16:41 +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: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f3429167e69a1da2a9c90ad8d62a0080710760a9 Date: Tue, 12 Jul 2011 19:16:41 +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: X-Archives-Hash: ee0b165d208e37f2c534c9563470441b commit: f3429167e69a1da2a9c90ad8d62a0080710760a9 Author: Zac Medico gentoo org> AuthorDate: Tue Jul 12 19:15:44 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jul 12 19:15:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df3429167 unmerge: reject USE conditionals in arguments --- pym/_emerge/actions.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index e57fd93..62dadee 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2535,8 +2535,7 @@ def action_uninstall(settings, trees, ldpath_mtimes= , (ignore_missing_eq and is_valid_package_atom('=3D' + x)): =20 try: - valid_atoms.append( - dep_expand(x, mydb=3Dvardb, settings=3Dsettings)) + atom =3D dep_expand(x, mydb=3Dvardb, settings=3Dsettings) except portage.exception.AmbiguousPackageName as e: msg =3D "The short ebuild name \"" + x + \ "\" is ambiguous. Please specify " + \ @@ -2550,6 +2549,17 @@ def action_uninstall(settings, trees, ldpath_mtime= s, level=3Dlogging.ERROR, noiselevel=3D-1) writemsg_level("\n", level=3Dlogging.ERROR, noiselevel=3D-1) return 1 + else: + if atom.use and atom.use.conditional: + writemsg_level( + ("\n\n!!! '%s' contains a conditional " + \ + "which is not allowed.\n") % (x,), + level=3Dlogging.ERROR, noiselevel=3D-1) + writemsg_level( + "!!! Please check ebuild(5) for full details.\n", + level=3Dlogging.ERROR) + return 1 + valid_atoms.append(atom) =20 elif x.startswith(os.sep): if not x.startswith(root):