]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[extractor/common] Fix m3u8 extraction on failure
authorSergey M․ <dstftw@gmail.com>
Sat, 31 Oct 2015 18:01:34 +0000 (00:01 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 31 Oct 2015 18:01:34 +0000 (00:01 +0600)
youtube_dl/extractor/common.py

index 59c3fa8dc6925ac2a482dcc4a1f80e162d730c47..1f09fbb47d892cc6dc5fe1353fd0b166603d2c1a 100644 (file)
@@ -943,13 +943,14 @@ class InfoExtractor(object):
             if re.match(r'^https?://', u)
             else compat_urlparse.urljoin(m3u8_url, u))
 
-        m3u8_doc, urlh = self._download_webpage_handle(
+        res = self._download_webpage_handle(
             m3u8_url, video_id,
             note=note or 'Downloading m3u8 information',
             errnote=errnote or 'Failed to download m3u8 information',
             fatal=fatal)
-        if m3u8_doc is False:
-            return m3u8_doc
+        if res is False:
+            return res
+        m3u8_doc, urlh = res
         m3u8_url = urlh.geturl()
         last_info = None
         last_media = None