From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 18 Mar 2006 02:10:56 +0000 (-0000)
Subject: Catch a possible SyntaxError from the eval function when parsing PORTAGE_WORKDIR_MODE... 
X-Git-Tag: v2.1_pre7~49
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e02bb3944f625ca360de9b092c88f0b96a3c2f1;p=portage.git

Catch a possible SyntaxError from the eval function when parsing PORTAGE_WORKDIR_MODE. Thanks to solar for reporting.

svn path=/main/trunk/; revision=2929
---

diff --git a/pym/portage.py b/pym/portage.py
index f29f0f531..0939091a9 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2650,7 +2650,7 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
 			raise ValueError("Invalid file mode: %s" % mysettings["PORTAGE_WORKDIR_MODE"])
 	except KeyError, e:
 		writemsg("!!! PORTAGE_WORKDIR_MODE is unset, using %s." % oct(workdir_mode))
-	except ValueError, e:
+	except (ValueError, SyntaxError), e:
 		writemsg("%s\n" % e)
 		writemsg("!!! Unable to parse PORTAGE_WORKDIR_MODE='%s', using %s.\n" % \
 		(mysettings["PORTAGE_WORKDIR_MODE"], oct(workdir_mode)))