| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-06 17:18:18 +0000 (Mon, 06 Oct 2008) |
| 3 |
New Revision: 11640 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.4/bin/emerge |
| 7 |
Log: |
| 8 |
Bug #239006 - In FakeVartree._aux_get_wrapper(), fall back to vdb metadata |
| 9 |
if the live ebuild's EAPI is unsupported. (trunk r11600) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.4/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.4/bin/emerge 2008-10-06 17:17:32 UTC (rev 11639) |
| 15 |
+++ main/branches/2.1.4/bin/emerge 2008-10-06 17:18:18 UTC (rev 11640) |
| 16 |
@@ -1083,7 +1083,7 @@ |
| 17 |
self._aux_get = self.dbapi.aux_get |
| 18 |
self.dbapi.aux_get = self._aux_get_wrapper |
| 19 |
self._aux_get_history = set() |
| 20 |
- self._portdb_keys = ["DEPEND", "RDEPEND", "PDEPEND"] |
| 21 |
+ self._portdb_keys = ["EAPI", "DEPEND", "RDEPEND", "PDEPEND"] |
| 22 |
self._portdb = portdb |
| 23 |
self._global_updates = None |
| 24 |
|
| 25 |
@@ -1095,6 +1095,8 @@ |
| 26 |
# Use the live ebuild metadata if possible. |
| 27 |
live_metadata = dict(izip(self._portdb_keys, |
| 28 |
self._portdb.aux_get(pkg, self._portdb_keys))) |
| 29 |
+ if not portage.eapi_is_supported(live_metadata["EAPI"]): |
| 30 |
+ raise KeyError(pkg) |
| 31 |
self.dbapi.aux_update(pkg, live_metadata) |
| 32 |
except (KeyError, portage_exception.PortageException): |
| 33 |
if self._global_updates is None: |
Archives