diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-02-21 12:58:53 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-02-21 12:58:59 +0200 |
| commit | 9463c5965e859b8a9686ee1eaa7bfed8fd4bccc6 (patch) | |
| tree | 54d9c8773e366d06e16a8d8fd6452c321f245a3f | |
| parent | e96359df703047716cf12f963f67369597e9b7e1 (diff) | |
| download | meson-9463c5965e859b8a9686ee1eaa7bfed8fd4bccc6.zip meson-9463c5965e859b8a9686ee1eaa7bfed8fd4bccc6.tar.gz meson-9463c5965e859b8a9686ee1eaa7bfed8fd4bccc6.tar.bz2 | |
Swallow stderr of helper process invocation because nobody needs to see it and it causes problems in Debian testing framework.
| -rw-r--r-- | mesonbuild/mesonlib.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index a814567..8244f0c 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -160,11 +160,12 @@ def version_compare(vstr1, vstr2): return cmpop(varr1, varr2) def default_libdir(): - try: - archpath = subprocess.check_output(['dpkg-architecture', '-qDEB_HOST_MULTIARCH']).decode().strip() + pc = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'], + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) + (stdo, _) = pc.communicate() + if pc.returncode == 0: + archpath = stdo.decode().strip() return 'lib/' + archpath - except: - pass if os.path.isdir('/usr/lib64'): return 'lib64' return 'lib' |