diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-05-13 01:36:25 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-05-13 01:36:25 -0700 |
commit | f31320b67c9f593a2a8592e1a4e547f5f641943a (patch) | |
tree | b5fbe65ded8a1ffc75ccf5f80c50e0872ad6972a /pym/_emerge | |
parent | 0903cf2a1544d970b286a3e7e1f3276daa4eab9c (diff) | |
download | portage-f31320b67c9f593a2a8592e1a4e547f5f641943a.tar.gz portage-f31320b67c9f593a2a8592e1a4e547f5f641943a.tar.bz2 portage-f31320b67c9f593a2a8592e1a4e547f5f641943a.zip |
_pkg_str: add version attribute for comparisons
This attribute can be passed directly into vercmp, avoiding the need to
generate this string many times.
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/Package.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 69739acc4..84a2cbced 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -28,7 +28,7 @@ class Package(Task): "root_config", "type_name", "category", "counter", "cp", "cpv_split", "inherited", "invalid", "iuse", "masks", "mtime", - "pf", "pv_split", "root", "slot", "slot_atom", "visible",) + \ + "pf", "root", "slot", "slot_atom", "version", "visible",) + \ ("_raw_metadata", "_use",) metadata_keys = [ @@ -71,8 +71,8 @@ class Package(Task): "IUSE contains defaults, but EAPI doesn't allow them") self.slot_atom = portage.dep.Atom("%s%s%s" % (self.cp, _slot_separator, slot)) self.category, self.pf = portage.catsplit(self.cpv) - self.cpv_split = portage.catpkgsplit(self.cpv) - self.pv_split = self.cpv_split[1:] + self.cpv_split = self.cpv.cpv_split + self.version = self.cpv.version if self.inherited is None: self.inherited = frozenset() @@ -532,28 +532,28 @@ class Package(Task): def __lt__(self, other): if other.cp != self.cp: return False - if portage.pkgcmp(self.pv_split, other.pv_split) < 0: + if portage.vercmp(self.version, other.version) < 0: return True return False def __le__(self, other): if other.cp != self.cp: return False - if portage.pkgcmp(self.pv_split, other.pv_split) <= 0: + if portage.vercmp(self.version, other.version) <= 0: return True return False def __gt__(self, other): if other.cp != self.cp: return False - if portage.pkgcmp(self.pv_split, other.pv_split) > 0: + if portage.vercmp(self.version, other.version) > 0: return True return False def __ge__(self, other): if other.cp != self.cp: return False - if portage.pkgcmp(self.pv_split, other.pv_split) >= 0: + if portage.vercmp(self.version, other.version) >= 0: return True return False |