From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5F1251381F3 for ; Wed, 14 Nov 2012 19:55:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BF7421C002; Wed, 14 Nov 2012 19:55:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A71D621C002 for ; Wed, 14 Nov 2012 19:55:16 +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 B1D0533DB52 for ; Wed, 14 Nov 2012 19:55:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1F0B8E5436 for ; Wed, 14 Nov 2012 19:55:14 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1352922899.20c14c193dad7f920a4b32ef2007fb9fac4f3b6a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/__init__.py X-VCS-Directories: pym/portage/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 20c14c193dad7f920a4b32ef2007fb9fac4f3b6a X-VCS-Branch: master Date: Wed, 14 Nov 2012 19:55:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c6b95ec7-d101-4853-9ca7-ceab9cfeef9f X-Archives-Hash: c420813ec17eeeeb684bcadc0fab1f95 commit: 20c14c193dad7f920a4b32ef2007fb9fac4f3b6a Author: Zac Medico gentoo org> AuthorDate: Wed Nov 14 19:54:59 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Nov 14 19:54:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=20c14c19 Atom.without_use: preserve blocker prefix --- pym/portage/dep/__init__.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 55181d7..60d1cc9 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1229,11 +1229,14 @@ class Atom(_unicode): if allow_repo is None: allow_repo = True + blocker_prefix = "" if "!" == s[:1]: blocker = self._blocker(forbid_overlap=("!" == s[1:2])) if blocker.overlap.forbid: + blocker_prefix = s[:2] s = s[2:] else: + blocker_prefix = s[:1] s = s[1:] else: blocker = False @@ -1346,15 +1349,18 @@ class Atom(_unicode): use = _use else: use = _use_dep(use_str[1:-1].split(","), eapi_attrs) - without_use = Atom(m.group('without_use'), allow_repo=allow_repo) + without_use = Atom(blocker_prefix + m.group('without_use'), + allow_repo=allow_repo) else: use = None if unevaluated_atom is not None and \ unevaluated_atom.use is not None: # unevaluated_atom.use is used for IUSE checks when matching # packages, so it must not propagate to without_use - without_use = Atom(s, allow_wildcard=allow_wildcard, - allow_repo=allow_repo) + without_use = Atom(_unicode(self), + allow_wildcard=allow_wildcard, + allow_repo=allow_repo, + eapi=eapi) else: without_use = self