1
0
mirror of https://github.com/l1ving/youtube-dl synced 2024-12-22 01:02:52 +08:00

Merge branch 'johnhawkinson-stdin2'

This commit is contained in:
Yen Chi Hsuan 2016-10-22 13:10:27 +08:00
commit e034cbc581
No known key found for this signature in database
GPG Key ID: 3FDDD575826C5C30
2 changed files with 10 additions and 0 deletions

View File

@ -1,3 +1,9 @@
version <unreleased>
Core
* Running youtube-dl in the background is fixed (#10996, #10706, #955)
version 2016.10.21.1
Extractors

View File

@ -1818,8 +1818,12 @@ def get_exe_version(exe, args=['--version'],
""" Returns the version of the specified executable,
or False if the executable is not present """
try:
# STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers
# SIGTTOU if youtube-dl is run in the background.
# See https://github.com/rg3/youtube-dl/issues/955#issuecomment-209789656
out, _ = subprocess.Popen(
[encodeArgument(exe)] + args,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()
except OSError:
return False