* [gentoo-commits] portage r11640 - main/branches/2.1.4/bin
@ 2008-10-06 17:18 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-10-06 17:18 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-10-06 17:18:18 +0000 (Mon, 06 Oct 2008)
New Revision: 11640
Modified:
main/branches/2.1.4/bin/emerge
Log:
Bug #239006 - In FakeVartree._aux_get_wrapper(), fall back to vdb metadata
if the live ebuild's EAPI is unsupported. (trunk r11600)
Modified: main/branches/2.1.4/bin/emerge
===================================================================
--- main/branches/2.1.4/bin/emerge 2008-10-06 17:17:32 UTC (rev 11639)
+++ main/branches/2.1.4/bin/emerge 2008-10-06 17:18:18 UTC (rev 11640)
@@ -1083,7 +1083,7 @@
self._aux_get = self.dbapi.aux_get
self.dbapi.aux_get = self._aux_get_wrapper
self._aux_get_history = set()
- self._portdb_keys = ["DEPEND", "RDEPEND", "PDEPEND"]
+ self._portdb_keys = ["EAPI", "DEPEND", "RDEPEND", "PDEPEND"]
self._portdb = portdb
self._global_updates = None
@@ -1095,6 +1095,8 @@
# Use the live ebuild metadata if possible.
live_metadata = dict(izip(self._portdb_keys,
self._portdb.aux_get(pkg, self._portdb_keys)))
+ if not portage.eapi_is_supported(live_metadata["EAPI"]):
+ raise KeyError(pkg)
self.dbapi.aux_update(pkg, live_metadata)
except (KeyError, portage_exception.PortageException):
if self._global_updates is None:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-10-06 17:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-06 17:18 [gentoo-commits] portage r11640 - main/branches/2.1.4/bin Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox