From: Zac Medico Date: Tue, 12 Jun 2012 07:21:57 +0000 (-0700) Subject: test_match_from_list: fix _pkg_str usage X-Git-Tag: v2.2.0_alpha111~50 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04b2e10ee87e4a09543d0b45d54dbcc9c4c990c8;p=portage.git test_match_from_list: fix _pkg_str usage --- diff --git a/pym/portage/tests/dep/test_match_from_list.py b/pym/portage/tests/dep/test_match_from_list.py index afba4141f..fae473e20 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 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 if sys.hexversion >= 0x3000000: basestring = str @@ -16,7 +16,7 @@ class Package(object): def __init__(self, atom): atom = Atom(atom, allow_repo=True) self.cp = atom.cp - self.cpv = atom.cpv + self.cpv = _pkg_str(atom.cpv, slot=(atom.slot or '0'), repo=atom.repo) self.cpv_split = catpkgsplit(self.cpv) self.slot = atom.slot self.repo = atom.repo