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 1SeLQt-0002g8-MO for garchives@archives.gentoo.org; Tue, 12 Jun 2012 07:22:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C86AE044C; Tue, 12 Jun 2012 07:22:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 04524E044C for ; Tue, 12 Jun 2012 07:22:12 +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 40F691B4029 for ; Tue, 12 Jun 2012 07:22:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0342BE5430 for ; Tue, 12 Jun 2012 07:22:11 +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: <1339485717.04b2e10ee87e4a09543d0b45d54dbcc9c4c990c8.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/dep/test_match_from_list.py X-VCS-Directories: pym/portage/tests/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 04b2e10ee87e4a09543d0b45d54dbcc9c4c990c8 X-VCS-Branch: master Date: Tue, 12 Jun 2012 07:22:11 +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: 7b86640c-fe07-4374-ab4b-bdee3272d0cb X-Archives-Hash: 328f0d803896665f888f21dafa6e1ca2 commit: 04b2e10ee87e4a09543d0b45d54dbcc9c4c990c8 Author: Zac Medico gentoo org> AuthorDate: Tue Jun 12 07:21:57 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jun 12 07:21:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D04b2e10e test_match_from_list: fix _pkg_str usage --- pym/portage/tests/dep/test_match_from_list.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage/tests/dep/test_match_from_list.py b/pym/portage/= tests/dep/test_match_from_list.py index afba414..fae473e 100644 --- a/pym/portage/tests/dep/test_match_from_list.py +++ b/pym/portage/tests/dep/test_match_from_list.py @@ -1,10 +1,10 @@ -# Copyright 2006, 2010 Gentoo Foundation +# Copyright 2006-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 import sys from portage.tests import TestCase from portage.dep import Atom, match_from_list, _repo_separator -from portage.versions import catpkgsplit +from portage.versions import catpkgsplit, _pkg_str =20 if sys.hexversion >=3D 0x3000000: basestring =3D str @@ -16,7 +16,7 @@ class Package(object): def __init__(self, atom): atom =3D Atom(atom, allow_repo=3DTrue) self.cp =3D atom.cp - self.cpv =3D atom.cpv + self.cpv =3D _pkg_str(atom.cpv, slot=3D(atom.slot or '0'), repo=3Datom= .repo) self.cpv_split =3D catpkgsplit(self.cpv) self.slot =3D atom.slot self.repo =3D atom.repo