Merge branch 'popen-stdin-devnull' into 'master'

common: use /dev/null as stdin when calling subprocess.Popen()

See merge request fdroid/fdroidserver!451
This commit is contained in:
Hans-Christoph Steiner 2018-02-05 14:46:08 +00:00
commit eac391c58f

View file

@ -2024,7 +2024,8 @@ def FDroidPopenBytes(commands, cwd=None, envs=None, output=True, stderr_to_stdou
p = None p = None
try: try:
p = subprocess.Popen(commands, cwd=cwd, shell=False, env=process_env, p = subprocess.Popen(commands, cwd=cwd, shell=False, env=process_env,
stdout=subprocess.PIPE, stderr=stderr_param) stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
stderr=stderr_param)
except OSError as e: except OSError as e:
raise BuildException("OSError while trying to execute " + raise BuildException("OSError while trying to execute " +
' '.join(commands) + ': ' + str(e)) ' '.join(commands) + ': ' + str(e))