[gentoo-commits] portage r12069 - main/branches/2.1.6/pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-11-24 00:51:09 +0000 (Mon, 24 Nov 2008)
New Revision: 12069

Modified:
   main/branches/2.1.6/pym/portage/__init__.py
Log:
Add support for parsing EAPI labels in contained in 'eapi' files in the
profiles, and bail out if the profile contains an unsupported EAPI value
in any one of it's directories. We don't necessarily have to use this but
at least it gives us some way to make emerge bail out early if a profile
contains unsupported EAPI features. (trunk r12068)


Modified: main/branches/2.1.6/pym/portage/__init__.py
===================================================================
--- main/branches/2.1.6/pym/portage/__init__.py	2008-11-24 00:50:07 UTC (rev 12068)
+++ main/branches/2.1.6/pym/portage/__init__.py	2008-11-24 00:51:09 UTC (rev 12069)
@@ -1197,6 +1197,17 @@
 				self.profiles = []
 				def addProfile(currentPath):
 					parentsFile = os.path.join(currentPath, "parent")
+					eapi_file = os.path.join(currentPath, "eapi")
+					try:
+						eapi = open(eapi_file).readline().strip()
+					except IOError:
+						pass
+					else:
+						if not eapi_is_supported(eapi):
+							raise portage.exception.ParseError(
+								"Profile contains unsupported " + \
+								"EAPI '%s': '%s'" % \
+								(eapi, os.path.realpath(eapi_file),))
 					if os.path.exists(parentsFile):
 						parents = grabfile(parentsFile)
 						if not parents: