Catch a possible SyntaxError from the eval function when parsing PORTAGE_WORKDIR_MODE...

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

diff --git a/pym/portage.py b/pym/portage.py
index f29f0f53150e75318732808621f33eaa71a0160c..0939091a9e2185c3c76f3df1f10b73ece58b0e0e 100644 (file)
--- 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)))