Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-12-22 11:02:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'johnhawkinson-stdin2'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
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 version 2016.10.21.1
Extractors Extractors

4
youtube_dl/utils.py
View File

@ -1818,8 +1818,12 @@ def get_exe_version(exe, args=['--version'],
""" Returns the version of the specified executable, """ Returns the version of the specified executable,
or False if the executable is not present """ or False if the executable is not present """
try: 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( out, _ = subprocess.Popen(
[encodeArgument(exe)] + args, [encodeArgument(exe)] + args,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate() stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()
except OSError: except OSError:
return False return False