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 1QsbaD-0000H2-VE for garchives@archives.gentoo.org; Sun, 14 Aug 2011 14:22:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46C9221C1D8; Sun, 14 Aug 2011 14:22:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EA55621C0F7 for ; Sun, 14 Aug 2011 14:22:24 +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 4D3581B403A for ; Sun, 14 Aug 2011 14:22:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 75C3B80040 for ; Sun, 14 Aug 2011 14:22:23 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <3d1f5a4701c93aea3082ff84bf5de7ceb4a8ad83.mgorny@gentoo> Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/portagepm/atom.py X-VCS-Directories: gentoopm/portagepm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3d1f5a4701c93aea3082ff84bf5de7ceb4a8ad83 Date: Sun, 14 Aug 2011 14:22:23 +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: 2af7d6a51c0a1655f6afee7d2ad575ae commit: 3d1f5a4701c93aea3082ff84bf5de7ceb4a8ad83 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sun Aug 14 13:42:04 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sun Aug 14 13:42:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3D3d1f5a47 Portage: fix category-less atom matching. --- gentoopm/portagepm/atom.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gentoopm/portagepm/atom.py b/gentoopm/portagepm/atom.py index 2f95888..a6f2296 100644 --- a/gentoopm/portagepm/atom.py +++ b/gentoopm/portagepm/atom.py @@ -123,10 +123,14 @@ class UncategorisedPackageWrapper(object): self._pkg =3D pkg =20 @property - def id(self): - cpv =3D self._pkg.id + def _cpv(self): + cpv =3D self._pkg._cpv return 'null/%s' % catsplit(cpv)[1] =20 + @property + def slot(self): + return self._pkg.slot + class UnexpandedPortageAtom(CompletePortageAtom): """ An atom without a category specified.