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 1QlSBF-0001qC-IY for garchives@archives.gentoo.org; Mon, 25 Jul 2011 20:55:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6257F21C05D; Mon, 25 Jul 2011 20:55:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3538221C05D for ; Mon, 25 Jul 2011 20:55:06 +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 AADD11BC00A for ; Mon, 25 Jul 2011 20:55:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 216EA8003D for ; Mon, 25 Jul 2011 20:55:05 +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: <3b5dede734e19aeedca11327e1e2b8443ec55f81.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: 3b5dede734e19aeedca11327e1e2b8443ec55f81 Date: Mon, 25 Jul 2011 20:55:05 +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: a9ef7a3ec1a6cf3ce8503d6e3c35be8d commit: 3b5dede734e19aeedca11327e1e2b8443ec55f81 Author: Zac Medico gentoo org> AuthorDate: Mon Jul 25 20:54:46 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 25 20:54:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3b5dede7 depgraph: make --exclude handle contradictions This makes contradictory things like `emerge -e @system --exclude gcc` work as expected. --- pym/_emerge/depgraph.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 9e3064d..70f9a99 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2289,7 +2289,10 @@ class depgraph(object): # specified on the command line. self._dynamic_config._pprovided_args.append((arg, atom)) continue - if pkg.installed and "selective" not in self._dynamic_config.mypara= ms: + if pkg.installed and \ + "selective" not in self._dynamic_config.myparams and \ + not self._frozen_config.excluded_pkgs.findAtomForPackage( + pkg, modified_use=3Dself._pkg_use_enabled(pkg)): self._dynamic_config._unsatisfied_deps_for_display.append( ((myroot, atom), {"myparent" : arg})) # Previous behavior was to bail out in this case, but @@ -3331,6 +3334,9 @@ class depgraph(object): """ if "selective" not in self._dynamic_config.myparams and \ pkg.root =3D=3D self._frozen_config.target_root: + if self._frozen_config.excluded_pkgs.findAtomForPackage(pkg, + modified_use=3Dself._pkg_use_enabled(pkg)): + return True try: next(self._iter_atoms_for_pkg(pkg)) except StopIteration: