From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 28 Jun 2007 04:58:54 +0000 (-0000)
Subject: For bug #183431, catch a ParseError caused by a corrupt profile and dump an error... 
X-Git-Tag: v2.1.3~124
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=361801e4b4ed59911763219da09608ca6bb02b6e;p=portage.git

For bug #183431, catch a ParseError caused by a corrupt profile and dump an error message.  This allows emerge to continue with actions that don't require a valid profile, such as --sync. (trunk r7073)

svn path=/main/branches/2.1.2/; revision=7074
---

diff --git a/pym/portage.py b/pym/portage.py
index db7ddcabd..d56b49445 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1125,7 +1125,14 @@ class config:
 									"Parent '%s' not found: '%s'" %  \
 									(parentPath, parentsFile))
 					self.profiles.append(currentPath)
-				addProfile(os.path.realpath(self.profile_path))
+				try:
+					addProfile(os.path.realpath(self.profile_path))
+				except portage_exception.ParseError, e:
+					writemsg("!!! Unable to parse profile: '%s'\n" % \
+						self.profile_path, noiselevel=-1)
+					writemsg("!!! ParseError: %s\n" % str(e), noiselevel=-1)
+					del e
+					self.profiles = []
 			if local_config:
 				custom_prof = os.path.join(
 					config_root, CUSTOM_PROFILE_PATH.lstrip(os.path.sep))