From 54948f1b625a90fb4eae9a0f0f5c45ecc90caa93 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 26 Nov 2013 21:32:38 +0100 Subject: build: remove pointless exception handling in oss check --- waftools/checks/custom.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'waftools') 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 -- cgit v1.2.3