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 1QTF0J-0003Km-Gu for garchives@archives.gentoo.org; Sun, 05 Jun 2011 15:12:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6EA71C039; Sun, 5 Jun 2011 15:12:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 861521C039 for ; Sun, 5 Jun 2011 15:12:32 +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 1E0EE1B400F for ; Sun, 5 Jun 2011 15:12:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 550BC8003C for ; Sun, 5 Jun 2011 15:12:31 +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: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/MergeListItem.py pym/_emerge/Package.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ee7bd00a6febac09bd97276e29bf7d1513ad2d84 Date: Sun, 5 Jun 2011 15:12:31 +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: 4d5f8f881fadc3ef6ef312e2632253dd commit: ee7bd00a6febac09bd97276e29bf7d1513ad2d84 Author: Zac Medico gentoo org> AuthorDate: Sun Jun 5 15:12:18 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jun 5 15:12:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dee7bd00a MergeListItem: fix "unknown repo" display The Package class uses an UNKNOWN_REPO constant so that MergeListItem can distinguish this case. --- pym/_emerge/MergeListItem.py | 2 +- pym/_emerge/Package.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/MergeListItem.py b/pym/_emerge/MergeListItem.py index 7de48f9..2176bf6 100644 --- a/pym/_emerge/MergeListItem.py +++ b/pym/_emerge/MergeListItem.py @@ -64,7 +64,7 @@ class MergeListItem(CompositeTask): if portdir_repo_name: pkg_repo_name =3D pkg.repo if pkg_repo_name !=3D portdir_repo_name: - if not pkg_repo_name: + if pkg_repo_name =3D=3D pkg.UNKNOWN_REPO: pkg_repo_name =3D "unknown repo" msg +=3D " from %s" % pkg_repo_name =20 diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index cb476d6..593e0d3 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -38,6 +38,7 @@ class Package(Task): =20 _dep_keys =3D ('DEPEND', 'PDEPEND', 'RDEPEND',) _use_conditional_misc_keys =3D ('LICENSE', 'PROPERTIES', 'RESTRICT') + UNKNOWN_REPO =3D "__unknown__" =20 def __init__(self, **kwargs): Task.__init__(self, **kwargs) @@ -69,7 +70,7 @@ class Package(Task): self.inherited =3D frozenset() repo =3D _gen_valid_repo(self.metadata.get('repository', '')) if not repo: - repo =3D '__unknown__' + repo =3D self.UNKNOWN_REPO self.metadata['repository'] =3D repo =20 self._validate_deps()