| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-25 21:45:41 +0000 (Sun, 25 May 2008) |
| 3 |
New Revision: 10420 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Remove the Package.cpv_slot attribute. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-25 21:34:21 UTC (rev 10419) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-25 21:45:41 UTC (rev 10420) |
| 15 |
@@ -1268,7 +1268,7 @@ |
| 16 |
__slots__ = ("built", "cpv", "depth", |
| 17 |
"installed", "metadata", "onlydeps", "operation", |
| 18 |
"root", "type_name", |
| 19 |
- "category", "cp", "cpv_slot", "cpv_split", |
| 20 |
+ "category", "cp", "cpv_split", |
| 21 |
"pf", "pv_split", "slot", "slot_atom", "use") |
| 22 |
|
| 23 |
metadata_keys = [ |
| 24 |
@@ -1284,11 +1284,6 @@ |
| 25 |
self.slot_atom = portage.dep.Atom("%s:%s" % \ |
| 26 |
(self.cp, self.metadata["SLOT"])) |
| 27 |
|
| 28 |
- # This used to be "%s:%s" % (self.cpv, self.slot) but now |
| 29 |
- # is's just a reference to self since match_from_list() |
| 30 |
- # now supports Package references. |
| 31 |
- self.cpv_slot = self |
| 32 |
- |
| 33 |
self.category, self.pf = portage.catsplit(self.cpv) |
| 34 |
self.cpv_split = portage.catpkgsplit(self.cpv) |
| 35 |
self.pv_split = self.cpv_split[1:] |
| 36 |
@@ -3143,9 +3138,7 @@ |
| 37 |
e_pkg = self._slot_pkg_map[root].get(pkg.slot_atom) |
| 38 |
if not e_pkg: |
| 39 |
break |
| 40 |
- cpv_slot = "%s:%s" % \ |
| 41 |
- (e_pkg.cpv, e_pkg.metadata["SLOT"]) |
| 42 |
- if portage.dep.match_from_list(atom, [cpv_slot]): |
| 43 |
+ if portage.dep.match_from_list(atom, [e_pkg]): |
| 44 |
if highest_version and \ |
| 45 |
e_pkg.cp == atom_cp and \ |
| 46 |
e_pkg < highest_version and \ |
| 47 |
|
| 48 |
-- |
| 49 |
gentoo-commits@l.g.o mailing list |
Archives