diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-12 00:38:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-12 00:38:35 +0000 |
| commit | 503ac541c767cedb0bd4abd9d349dbd9cc803fc9 (patch) | |
| tree | 72c2049e9a923a9ac7380ab145e61dff937281fc /pym/portage/getbinpkg.py | |
| parent | 26cb7d9dc0d348b37d5435a1c1097dae59a56fe5 (diff) | |
| download | portage-503ac541c767cedb0bd4abd9d349dbd9cc803fc9.tar.gz portage-503ac541c767cedb0bd4abd9d349dbd9cc803fc9.tar.bz2 portage-503ac541c767cedb0bd4abd9d349dbd9cc803fc9.zip | |
Pass default package metadata values into the PackageIndex
constructor for optional things like EAPI and SLOT.
svn path=/main/trunk/; revision=8054
Diffstat (limited to 'pym/portage/getbinpkg.py')
| -rw-r--r-- | pym/portage/getbinpkg.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index a248e378b..108161c02 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -664,7 +664,8 @@ def writepkgindex(pkgfile, items): class PackageIndex(object): - def __init__(self): + def __init__(self, default_pkg_data=None): + self._default_pkg_data = default_pkg_data self.header = {} self.packages = {} self.modified = True @@ -685,11 +686,9 @@ class PackageIndex(object): mycpv = d.get("CPV") if not mycpv: continue - d.setdefault("EAPI", "0") - d.setdefault("IUSE", "") - d.setdefault("PROVIDE", "") - d.setdefault("SLOT", "0") - d.setdefault("USE", "") + if self._default_pkg_data: + for k, v in self._default_pkg_data.iteritems(): + d.setdefault(k, v) if header_chost: d.setdefault("CHOST", header_chost) self.packages[mycpv] = d @@ -708,10 +707,10 @@ class PackageIndex(object): metadata = self.packages[cpv].copy() if metadata.get("CHOST") == header_chost: del metadata["CHOST"] - if metadata.get("EAPI") == "0": - del metadata["EAPI"] - if metadata.get("SLOT") == "0": - del metadata["SLOT"] + if self._default_pkg_data: + for k, v in self._default_pkg_data.iteritems(): + if metadata.get(k) == v: + metadata.pop(k, None) keys = metadata.keys() keys.sort() writepkgindex(pkgfile, |