Bug #262211 - Make vardbapi.aux_get() translate empty SLOT to 0 since other

code expects non-empty SLOT (for generation package slot atoms). (trunk r13060)

svn path=/main/branches/2.1.6/; revision=13074

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 43091d4ea42a11018279490f3d8b97fbd5f9929f..399aa2791e8bc0bf20b3da53e5f40de86aff37c9 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -518,6 +518,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):