summaryrefslogtreecommitdiffstats
path: root/waftools
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-26 21:32:38 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-26 21:35:37 +0100
commit54948f1b625a90fb4eae9a0f0f5c45ecc90caa93 (patch)
treed49057bd2698eafc9b04f7d446aeb099389515bf /waftools
parent803ff1a283160b50417a61c35689136d0191470b (diff)
downloadmpv-54948f1b625a90fb4eae9a0f0f5c45ecc90caa93.tar.bz2
mpv-54948f1b625a90fb4eae9a0f0f5c45ecc90caa93.tar.xz
build: remove pointless exception handling in oss check
Diffstat (limited to 'waftools')
-rw-r--r--waftools/checks/custom.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
index 623a02fda8..6247d00353 100644
--- a/waftools/checks/custom.py
+++ b/waftools/checks/custom.py
@@ -81,15 +81,11 @@ def __fail_oss_check__(ctx):
def __get_osslibdir__():
from waflib import Utils
-
- try:
- cmd = ['sh', '-c', '. /etc/oss.conf && echo $OSSLIBDIR']
- p = Utils.subprocess.Popen(cmd, stdin=Utils.subprocess.PIPE,
- stdout=Utils.subprocess.PIPE,
- stderr=Utils.subprocess.PIPE)
- return p.communicate()[0].decode().rstrip()
- except Exception:
- return ""
+ cmd = ['sh', '-c', '. /etc/oss.conf && echo $OSSLIBDIR']
+ p = Utils.subprocess.Popen(cmd, stdin=Utils.subprocess.PIPE,
+ stdout=Utils.subprocess.PIPE,
+ stderr=Utils.subprocess.PIPE)
+ return p.communicate()[0].decode().rstrip()
def __get_osscflags__():
import os