diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2014-08-27 15:56:27 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2014-08-27 15:56:27 +0200 |
| commit | 7798fad535750acb2e96f1055062fa98d0694a55 (patch) | |
| tree | e9be7de6d6bcd4c28dab62bb3932959f4eff73e7 | |
| parent | baf2907501b676df04f98e0ebf8bfaf4ace6e791 (diff) | |
| download | youtube-dl-7798fad535750acb2e96f1055062fa98d0694a55.tar.gz youtube-dl-7798fad535750acb2e96f1055062fa98d0694a55.tar.xz youtube-dl-7798fad535750acb2e96f1055062fa98d0694a55.zip | |
[downloader/rtmp] Use check_exectuble
| -rw-r--r-- | youtube_dl/downloader/rtmp.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py index 68646709a..5eb108302 100644 --- a/youtube_dl/downloader/rtmp.py +++ b/youtube_dl/downloader/rtmp.py @@ -8,9 +8,10 @@ import time from .common import FileDownloader from ..utils import ( + check_executable, + compat_str, encodeFilename, format_bytes, - compat_str, ) @@ -103,9 +104,7 @@ class RtmpFD(FileDownloader): test = self.params.get('test', False) # Check for rtmpdump first - try: - subprocess.call(['rtmpdump', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT) - except (OSError, IOError): + if not check_executable('rtmpdump', ['-h']): self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install it.') return False |