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 1Slpmo-0002HP-8j for garchives@archives.gentoo.org; Mon, 02 Jul 2012 23:12:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD0BDE064E; Mon, 2 Jul 2012 23:11:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8547FE064E for ; Mon, 2 Jul 2012 23:11:58 +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 780E41B4043 for ; Mon, 2 Jul 2012 23:11:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2FC62E5436 for ; Mon, 2 Jul 2012 23:11:56 +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: <1341270705.e9aff636fa22ca91f47a3c5b0955e8e7baee5d6a.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: e9aff636fa22ca91f47a3c5b0955e8e7baee5d6a X-VCS-Branch: master Date: Mon, 2 Jul 2012 23:11:56 +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: 88626cbe-ca2e-4189-bcce-b3a2a8d5d05f X-Archives-Hash: 72e35bead0218e5b38e9f988d3b2c526 commit: e9aff636fa22ca91f47a3c5b0955e8e7baee5d6a Author: Zac Medico gentoo org> AuthorDate: Mon Jul 2 23:11:45 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 2 23:11:45 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De9aff636 Atom: tweak indent for slot logic --- pym/portage/dep/__init__.py | 48 +++++++++++++++++++++----------------= ----- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index c722e48..d71ec09 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1430,12 +1430,12 @@ class Atom(_unicode): 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 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 + 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 atom +=3D _repo_separator + repo if self.use is not None: atom +=3D _unicode(self.use) @@ -1497,12 +1497,12 @@ class Atom(_unicode): 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 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 + 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) @@ -1525,12 +1525,12 @@ class Atom(_unicode): 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 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 + 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) @@ -1541,12 +1541,12 @@ class Atom(_unicode): 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 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 + 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)