diff options
| -rw-r--r-- | compilers.py | 7 | ||||
| -rw-r--r-- | interpreter.py | 2 | ||||
| -rwxr-xr-x | meson.py | 4 | ||||
| -rw-r--r-- | readme.txt | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/compilers.py b/compilers.py index b205cd5..7907235 100644 --- a/compilers.py +++ b/compilers.py @@ -406,7 +406,12 @@ int someSymbolHereJustForFun; cmdlist = self.exe_wrapper + [exename] else: cmdlist = exename - pe = subprocess.Popen(cmdlist, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + try: + pe = subprocess.Popen(cmdlist, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + except Exception as e: + mlog.debug('Could not run: %s (error: %s)\n' % (cmdlist, e)) + return RunResult(False) + (so, se) = pe.communicate() so = so.decode() se = se.decode() diff --git a/interpreter.py b/interpreter.py index cacfe05..f4c09a4 100644 --- a/interpreter.py +++ b/interpreter.py @@ -1150,7 +1150,7 @@ class Interpreter(): raise InvalidCode('First argument to set_variable must be a string.') if not self.is_assignable(variable): raise InvalidCode('Assigned value not of assignable type.') - if re.fullmatch('[_a-zA-Z][_0-9a-zA-Z]*', varname) is None: + if re.match('[_a-zA-Z][_0-9a-zA-Z]*$', varname) is None: raise InvalidCode('Invalid variable name: ' + varname) if varname in self.builtin: raise InvalidCode('Tried to overwrite internal variable "%s"' % varname) @@ -164,8 +164,8 @@ itself as required.''' pickle.dump(b, open(dumpfile, 'wb')) def run(args): - if sys.version_info < (3, 4): - print('Meson works correctly only with python 3.4+.') + if sys.version_info < (3, 3): + print('Meson works correctly only with python 3.3+.') print('You have python %s.' % sys.version) print('Please update your environment') return 1 @@ -4,7 +4,7 @@ build system. Dependencies -Python http://python.org (version 3.4 or newer) +Python http://python.org (version 3.3 or newer) Ninja http://martine.github.com/ninja/ |