From 1cce664e5f81964da004996459788b2f69dbc574 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Tue, 26 May 2015 11:39:39 +0200 Subject: [PATCH] Remove check_call for python 2.6 suport... --- scripts/compilation/create_ninja_build.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/compilation/create_ninja_build.py b/scripts/compilation/create_ninja_build.py index 821c381e..7f2ea8d9 100755 --- a/scripts/compilation/create_ninja_build.py +++ b/scripts/compilation/create_ninja_build.py @@ -473,13 +473,16 @@ def get_program(path_module): import subprocess try: - fnull = open(os.devnull, 'w') cmd = 'grep -l "program" {0}/*.irp.f'.format(path_module.abs) - p = subprocess.check_output([cmd], shell=True, stderr=fnull) - except subprocess.CalledProcessError: + process = subprocess.Popen([cmd],shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = process.communicate() + except OSError: return [] else: - return [os.path.basename(f).split(".")[0] for f in p.split()] + if "No such file or directory" not in stdout: + return [os.path.basename(f).split(".")[0] for f in stdout.split()] + else: + return [] def ninja_binary_rule():