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 1R6uz3-0005xW-Rt for garchives@archives.gentoo.org; Fri, 23 Sep 2011 01:55:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C3E221C0E0; Fri, 23 Sep 2011 01:55:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1D45621C0E0 for ; Fri, 23 Sep 2011 01: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 A35591B4015 for ; Fri, 23 Sep 2011 01:55:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 05B2E80042 for ; Fri, 23 Sep 2011 01: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: <5c0f7b06a0b7f6461b3d38ea5a7c261d767fd82b.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: 5c0f7b06a0b7f6461b3d38ea5a7c261d767fd82b Date: Fri, 23 Sep 2011 01: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: 297d4e18bf751b7ec73f5148350c7eea commit: 5c0f7b06a0b7f6461b3d38ea5a7c261d767fd82b Author: Zac Medico gentoo org> AuthorDate: Fri Sep 23 01:54:52 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Sep 23 01:54:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5c0f7b06 Fix Atom.with_repo() bugs. --- pym/portage/dep/__init__.py | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 5bb6bec..21e2fac 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1217,12 +1217,9 @@ class Atom(_atom_base): allow_repo=3DTrue, allow_wildcard=3DTrue) =20 def with_repo(self, repo): - if self.slot is None: - atom =3D self - else: - atom =3D remove_slot(self) + atom =3D remove_slot(self) if self.slot is not None: - atom +=3D _slot_separator + slot + atom +=3D _slot_separator + self.slot atom +=3D _repo_separator + repo if self.use is not None: atom +=3D str(self.use)