| 1 |
Author: zmedico |
| 2 |
Date: 2009-03-11 23:49:03 +0000 (Wed, 11 Mar 2009) |
| 3 |
New Revision: 13060 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Bug #262211 - Make vardbapi.aux_get() translate empty SLOT to 0 since other |
| 9 |
code expects non-empty SLOT (for generation package slot atoms). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/vartree.py 2009-03-11 22:28:16 UTC (rev 13059) |
| 15 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2009-03-11 23:49:03 UTC (rev 13060) |
| 16 |
@@ -1179,6 +1179,10 @@ |
| 17 |
cache_data[aux_key] = mydata[aux_key] |
| 18 |
self._aux_cache["packages"][mycpv] = (mydir_mtime, cache_data) |
| 19 |
self._aux_cache["modified"].add(mycpv) |
| 20 |
+ if not mydata['SLOT']: |
| 21 |
+ # Empty slot triggers InvalidAtom exceptions when generating slot |
| 22 |
+ # atoms for packages, so translate it to '0' here. |
| 23 |
+ mydata['SLOT'] = '0' |
| 24 |
return [mydata[x] for x in wants] |
| 25 |
|
| 26 |
def _aux_get(self, mycpv, wants, st=None): |
Archives