| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:08:16 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13494 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/portage/dbapi/porttree.py |
| 7 |
Log: |
| 8 |
Bug #265768 - If the user happens to be using the metadata_overlay module |
| 9 |
then initialize it's eclass cache with an appropriate instance inside the |
| 10 |
portdbapi constructor. (trunk r13329) |
| 11 |
|
| 12 |
Modified: main/branches/2.1.6/pym/portage/dbapi/porttree.py |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.6/pym/portage/dbapi/porttree.py 2009-04-30 07:08:01 UTC (rev 13493) |
| 15 |
+++ main/branches/2.1.6/pym/portage/dbapi/porttree.py 2009-04-30 07:08:16 UTC (rev 13494) |
| 16 |
@@ -264,8 +264,8 @@ |
| 17 |
# ~harring |
| 18 |
filtered_auxdbkeys = filter(lambda x: not x.startswith("UNUSED_0"), auxdbkeys) |
| 19 |
filtered_auxdbkeys.sort() |
| 20 |
+ from portage.cache import metadata_overlay, volatile |
| 21 |
if secpass < 1: |
| 22 |
- from portage.cache import metadata_overlay, volatile |
| 23 |
for x in self.porttrees: |
| 24 |
db_ro = self.auxdbmodule(self.depcachedir, x, |
| 25 |
filtered_auxdbkeys, gid=portage_gid, readonly=True) |
| 26 |
@@ -280,6 +280,8 @@ |
| 27 |
# location, label, auxdbkeys |
| 28 |
self.auxdb[x] = self.auxdbmodule( |
| 29 |
self.depcachedir, x, filtered_auxdbkeys, gid=portage_gid) |
| 30 |
+ if self.auxdbmodule is metadata_overlay.database: |
| 31 |
+ self.auxdb[x].db_ro.ec = self._repo_info[x].eclass_db |
| 32 |
if "metadata-transfer" not in self.mysettings.features: |
| 33 |
for x in self.porttrees: |
| 34 |
if x in self._pregen_auxdb: |
Archives