diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-03-18 02:10:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-03-18 02:10:56 +0000 |
| commit | 4e02bb3944f625ca360de9b092c88f0b96a3c2f1 (patch) | |
| tree | 4195cad1ef431e2a62d802bdb74bc70f0fbb570a | |
| parent | 42b3d6abac79ef6e5fb6d40536b710d9fff85611 (diff) | |
| download | portage-4e02bb3944f625ca360de9b092c88f0b96a3c2f1.tar.gz portage-4e02bb3944f625ca360de9b092c88f0b96a3c2f1.tar.bz2 portage-4e02bb3944f625ca360de9b092c88f0b96a3c2f1.zip | |
Catch a possible SyntaxError from the eval function when parsing PORTAGE_WORKDIR_MODE. Thanks to solar for reporting.
svn path=/main/trunk/; revision=2929
| -rw-r--r-- | pym/portage.py | 2 |
1 files changed, 1 insertions, 1 deletions
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))) |