diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-12-12 18:20:51 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-12-12 18:20:51 +0200 |
| commit | da0bd2acf77f2f3f90c03e33b71da9a7f4bc1d37 (patch) | |
| tree | c78408526e3f4fe04121ae6110399495654191f5 | |
| parent | bab7edfc10f8b74fcb3b72507fe5d5098ab186e2 (diff) | |
| download | meson-da0bd2acf77f2f3f90c03e33b71da9a7f4bc1d37.zip meson-da0bd2acf77f2f3f90c03e33b71da9a7f4bc1d37.tar.gz meson-da0bd2acf77f2f3f90c03e33b71da9a7f4bc1d37.tar.bz2 | |
Ignore decode errors to work with compilers that write out non-utf8 text.
| -rw-r--r-- | environment.py | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/environment.py b/environment.py index 308a21c..8db4bd5 100644 --- a/environment.py +++ b/environment.py @@ -183,8 +183,8 @@ class Environment(): except OSError: continue (out, err) = p.communicate() - out = out.decode() - err = err.decode() + out = out.decode(errors='ignore') + err = err.decode(errors='ignore') vmatch = re.search(Environment.version_regex, out) if vmatch: version = vmatch.group(0) @@ -232,8 +232,8 @@ class Environment(): except OSError: continue (out, err) = p.communicate() - out = out.decode() - err = err.decode() + out = out.decode(errors='ignore') + err = err.decode(errors='ignore') version = 'unknown version' vmatch = re.search(Environment.version_regex, out) @@ -307,8 +307,8 @@ class Environment(): except OSError: continue (out, err) = p.communicate() - out = out.decode() - err = err.decode() + out = out.decode(errors='ignore') + err = err.decode(errors='ignore') vmatch = re.search(Environment.version_regex, out) if vmatch: version = vmatch.group(0) @@ -345,8 +345,8 @@ class Environment(): except OSError: raise EnvironmentException('Could not execute ObjC compiler "%s"' % ' '.join(exelist)) (out, err) = p.communicate() - out = out.decode() - err = err.decode() + out = out.decode(errors='ignore') + err = err.decode(errors='ignore') vmatch = re.search(Environment.version_regex, out) if vmatch: version = vmatch.group(0) @@ -375,8 +375,8 @@ class Environment(): except OSError: raise EnvironmentException('Could not execute ObjC++ compiler "%s"' % ' '.join(exelist)) (out, err) = p.communicate() - out = out.decode() - err = err.decode() + out = out.decode(errors='ignore') + err = err.decode(errors='ignore') vmatch = re.search(Environment.version_regex, out) if vmatch: version = vmatch.group(0) @@ -398,8 +398,8 @@ class Environment(): except OSError: raise EnvironmentException('Could not execute Java compiler "%s"' % ' '.join(exelist)) (out, err) = p.communicate() - out = out.decode() - err = err.decode() + out = out.decode(errors='ignore') + err = err.decode(errors='ignore') vmatch = re.search(Environment.version_regex, err) if vmatch: version = vmatch.group(0) @@ -416,8 +416,8 @@ class Environment(): except OSError: raise EnvironmentException('Could not execute C# compiler "%s"' % ' '.join(exelist)) (out, err) = p.communicate() - out = out.decode() - err = err.decode() + out = out.decode(errors='ignore') + err = err.decode(errors='ignore') vmatch = re.search(Environment.version_regex, out) if vmatch: version = vmatch.group(0) @@ -434,7 +434,7 @@ class Environment(): except OSError: raise EnvironmentException('Could not execute Vala compiler "%s"' % ' '.join(exelist)) (out, _) = p.communicate() - out = out.decode() + out = out.decode(errors='ignore') vmatch = re.search(Environment.version_regex, out) if vmatch: version = vmatch.group(0) @@ -451,7 +451,7 @@ class Environment(): except OSError: raise EnvironmentException('Could not execute Rust compiler "%s"' % ' '.join(exelist)) (out, _) = p.communicate() - out = out.decode() + out = out.decode(errors='ignore') vmatch = re.search(Environment.version_regex, out) if vmatch: version = vmatch.group(0) @@ -468,7 +468,7 @@ class Environment(): except OSError: raise EnvironmentException('Could not execute Swift compiler "%s"' % ' '.join(exelist)) (_, err) = p.communicate() - err = err.decode() + err = err.decode(errors='ignore') vmatch = re.search(Environment.version_regex, err) if vmatch: version = vmatch.group(0) @@ -499,8 +499,8 @@ class Environment(): except OSError: raise EnvironmentException('Could not execute static linker "%s".' % linker) (out, err) = p.communicate() - out = out.decode() - err = err.decode() + out = out.decode(errors='ignore') + err = err.decode(errors='ignore') if '/OUT:' in out or '/OUT:' in err: return VisualStudioLinker([linker]) if p.returncode == 0: |