diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-03-11 23:49:03 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 23:49:03 +0000 |
| commit | 5ee93420b31ab1bb69e1d6f87ddfb9d70631a651 (patch) | |
| tree | e5f3e5a7357a4335bc3f8d6fb60ce86e8ba6d045 | |
| parent | Bug #262012 - Only trigger the slot conflict message about --newuse when (diff) | |
| download | portage-multirepo-5ee93420b31ab1bb69e1d6f87ddfb9d70631a651.tar.gz portage-multirepo-5ee93420b31ab1bb69e1d6f87ddfb9d70631a651.tar.bz2 portage-multirepo-5ee93420b31ab1bb69e1d6f87ddfb9d70631a651.zip | |
Bug #262211 - Make vardbapi.aux_get() translate empty SLOT to 0 since other
code expects non-empty SLOT (for generation package slot atoms).
svn path=/main/trunk/; revision=13060
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 48a2a163..9f6a72b0 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1179,6 +1179,10 @@ class vardbapi(dbapi): cache_data[aux_key] = mydata[aux_key] self._aux_cache["packages"][mycpv] = (mydir_mtime, cache_data) self._aux_cache["modified"].add(mycpv) + if not mydata['SLOT']: + # Empty slot triggers InvalidAtom exceptions when generating slot + # atoms for packages, so translate it to '0' here. + mydata['SLOT'] = '0' return [mydata[x] for x in wants] def _aux_get(self, mycpv, wants, st=None): |