dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[downloader/rtmp] Use check_exectuble

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-08-27 15:56:27 +02:00
parent baf2907501
commit 7798fad535
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/downloader/rtmp.py
View File

@ -8,9 +8,10 @@ import time
from .common import FileDownloader from .common import FileDownloader
from ..utils import ( from ..utils import (
check_executable,
compat_str,
encodeFilename, encodeFilename,
format_bytes, format_bytes,
compat_str,
) )
@ -103,9 +104,7 @@ class RtmpFD(FileDownloader):
test = self.params.get('test', False) test = self.params.get('test', False)
# Check for rtmpdump first # Check for rtmpdump first
try: if not check_executable('rtmpdump', ['-h']):
subprocess.call(['rtmpdump', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT)
except (OSError, IOError):
self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install it.') self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install it.')
return False return False