public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] portage r11600 - main/trunk/pym/_emerge
@ 2008-09-29 16:58 Zac Medico (zmedico)
  0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-09-29 16:58 UTC (permalink / raw
  To: gentoo-commits

Author: zmedico
Date: 2008-09-29 16:58:48 +0000 (Mon, 29 Sep 2008)
New Revision: 11600

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Bug #239006 - In FakeVartree._aux_get_wrapper(), fall back to vdb metadata
if the live ebuild's EAPI is unsupported.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-09-29 00:18:59 UTC (rev 11599)
+++ main/trunk/pym/_emerge/__init__.py	2008-09-29 16:58:48 UTC (rev 11600)
@@ -1102,7 +1102,7 @@
 		self._match = self.dbapi.match
 		self.dbapi.match = self._match_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
 
@@ -1128,6 +1128,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-09-29 16:58 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-29 16:58 [gentoo-commits] portage r11600 - main/trunk/pym/_emerge 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