idolpx/fsp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix jade detection. Scons ships with outdated subprocess module

Browse Source
This commit is contained in:
Radim Kolar 2014-09-08 16:36:21 +02:00
parent 795eba7c3b
commit 2c1e494147
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
site_scons/jade.py
View File

@ -1,8 +1,8 @@
# #
# SCons DSSSL processor check # SCons DSSSL processor check
# #
# Version 1.0 # Version 1.1
# 07-Sep-2014 # 08-Sep-2014
# #
import subprocess import subprocess
@ -11,11 +11,13 @@ def checkDSSSLProcessor(check, name="jade"):
"""Check if DSSSL engine is working. Returns True or False.""" """Check if DSSSL engine is working. Returns True or False."""
check.Message("Checking if DSSSL processor "+name+" works... ") check.Message("Checking if DSSSL processor "+name+" works... ")
try: try:
echo = subprocess.Popen(('/bin/echo','""'), stdout = subprocess.PIPE ) echo = subprocess.Popen(['/bin/echo', '""'], stdout = subprocess.PIPE )
version = subprocess.check_output((name, '-v'), stdin = echo.stdout, stderr = subprocess.STDOUT ) version = subprocess.Popen([name, '-v'], stdin = echo.stdout, stdout= subprocess.PIPE, stderr = subprocess.PIPE )
except subprocess.CalledProcessError as e: stderr = repr(version.communicate()[1])
if "version" in e.output: if "version" in stderr:
check.Result(True) check.Result(True)
return True return True
except subprocess.CalledProcessError:
pass
check.Result(False) check.Result(False)
return False return False