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 1SlnEL-0003bu-4Z for garchives@archives.gentoo.org; Mon, 02 Jul 2012 20:28:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2826CE0603; Mon, 2 Jul 2012 20:28:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D3B27E0603 for ; Mon, 2 Jul 2012 20:28:11 +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 D78191B4009 for ; Mon, 2 Jul 2012 20:28:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 951DCE5436 for ; Mon, 2 Jul 2012 20:28:09 +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: <1341260877.47029cd18764795a4c2cff1f985c56c87ca07ed9.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: 47029cd18764795a4c2cff1f985c56c87ca07ed9 X-VCS-Branch: master Date: Mon, 2 Jul 2012 20:28:09 +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: ef498d37-0f14-464f-bf2e-941fb32c9fca X-Archives-Hash: 178917ad050c4cfc2626cbce57812373 commit: 47029cd18764795a4c2cff1f985c56c87ca07ed9 Author: Zac Medico gentoo org> AuthorDate: Mon Jul 2 20:27:57 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 2 20:27:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D47029cd1 Atom: evaluate_conditionals slot-abi, bug #424489 --- pym/portage/dep/__init__.py | 38 +++++++++++++++++++++++++++++++------= - 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 557c92b..c722e48 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1428,8 +1428,14 @@ class Atom(_unicode): =20 def with_repo(self, repo): atom =3D remove_slot(self) + if self.slot is not None or self.slot_abi_op is not None: + atom +=3D _slot_separator if self.slot is not None: - atom +=3D _slot_separator + self.slot + atom +=3D self.slot + if self.slot_abi is not None: + atom +=3D "/%s" % self.slot_abi + if self.slot_abi_op is not None: + atom +=3D self.slot_abi_op atom +=3D _repo_separator + repo if self.use is not None: atom +=3D _unicode(self.use) @@ -1489,8 +1495,14 @@ class Atom(_unicode): if not (self.use and self.use.conditional): return self atom =3D remove_slot(self) - if self.slot: - atom +=3D ":%s" % self.slot + if self.slot is not None or self.slot_abi_op is not None: + atom +=3D _slot_separator + if self.slot is not None: + atom +=3D self.slot + if self.slot_abi is not None: + atom +=3D "/%s" % self.slot_abi + if self.slot_abi_op is not None: + atom +=3D self.slot_abi_op use_dep =3D self.use.evaluate_conditionals(use) atom +=3D _unicode(use_dep) return Atom(atom, unevaluated_atom=3Dself, allow_repo=3D(self.repo is = not None), _use=3Duse_dep) @@ -1511,8 +1523,14 @@ class Atom(_unicode): if not self.use: return self atom =3D remove_slot(self) - if self.slot: - atom +=3D ":%s" % self.slot + if self.slot is not None or self.slot_abi_op is not None: + atom +=3D _slot_separator + if self.slot is not None: + atom +=3D self.slot + if self.slot_abi is not None: + atom +=3D "/%s" % self.slot_abi + if self.slot_abi_op is not None: + atom +=3D self.slot_abi_op use_dep =3D self.use.violated_conditionals(other_use, is_valid_flag, p= arent_use) atom +=3D _unicode(use_dep) return Atom(atom, unevaluated_atom=3Dself, allow_repo=3D(self.repo is = not None), _use=3Duse_dep) @@ -1521,8 +1539,14 @@ class Atom(_unicode): if not (self.use and self.use.conditional): return self atom =3D remove_slot(self) - if self.slot: - atom +=3D ":%s" % self.slot + if self.slot is not None or self.slot_abi_op is not None: + atom +=3D _slot_separator + if self.slot is not None: + atom +=3D self.slot + if self.slot_abi is not None: + atom +=3D "/%s" % self.slot_abi + if self.slot_abi_op is not None: + atom +=3D self.slot_abi_op use_dep =3D self.use._eval_qa_conditionals(use_mask, use_force) atom +=3D _unicode(use_dep) return Atom(atom, unevaluated_atom=3Dself, allow_repo=3D(self.repo is = not None), _use=3Duse_dep)