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 1QfkeP-0006eF-AA for garchives@archives.gentoo.org; Sun, 10 Jul 2011 03:25:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA21E21C2A6; Sun, 10 Jul 2011 03:25:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BB1A921C2A6 for ; Sun, 10 Jul 2011 03:25:37 +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 203FA2AC130 for ; Sun, 10 Jul 2011 03:25:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 755C08003D for ; Sun, 10 Jul 2011 03:25:36 +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: <895823111601bb73204daf5cdaf86d401d91983c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 895823111601bb73204daf5cdaf86d401d91983c Date: Sun, 10 Jul 2011 03:25:36 +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: 8c9a42c17a1dd36af972f81d32a05b3b commit: 895823111601bb73204daf5cdaf86d401d91983c Author: Zac Medico gentoo org> AuthorDate: Sun Jul 10 03:24:49 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jul 10 03:24:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D89582311 depgraph: reject USE conditionals in arguments --- pym/_emerge/depgraph.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 64ed50e..2a5848c 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2082,6 +2082,14 @@ class depgraph(object): else: atom =3D null_atom =20 + if atom.use and atom.use.conditional: + writemsg( + ("\n\n!!! '%s' contains a conditional " + \ + "which is not allowed.\n") % (x,), noiselevel=3D-1) + writemsg("!!! Please check ebuild(5) for full details.\n") + self._dynamic_config._skip_restart =3D True + return (0,[]) + args.append(AtomArg(arg=3Dx, atom=3Datom, root_config=3Droot_config)) =20