diff options
| author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-12-31 19:21:28 +0100 |
|---|---|---|
| committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-12-31 19:21:28 +0100 |
| commit | 0214ce7c7584bd27c6e175065e3991d97af05855 (patch) | |
| tree | 7f59bfde8c26c97206d7794a6dca829d49bb29b6 | |
| parent | 95fedbf86bd6c8820b01768db53355fe488dff5e (diff) | |
Ok, the Escapist test was passing only in my Travis repo, do not ask me why; also, a small bugfix to the latest commit
| -rw-r--r-- | test/tests.json | 3 | ||||
| -rw-r--r-- | youtube_dl/FileDownloader.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/tests.json b/test/tests.json index 982e0ad3b..c2de6099d 100644 --- a/test/tests.json +++ b/test/tests.json @@ -95,7 +95,8 @@ "name": "Escapist", "url": "http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate", "file": "6618-Breaking-Down-Baldurs-Gate.flv", - "md5": "c6793dbda81388f4264c1ba18684a74d" + "md5": "c6793dbda81388f4264c1ba18684a74d", + "skip": "Fails with timeout on Travis" }, { "name": "GooglePlus", diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 53c68237b..ebc2552df 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -494,7 +494,7 @@ class FileDownloader(object): # Extract information from URL and process it videos = ie.extract(url) - if len(videos) > 1 and self.fixed_template(): + if len(videos or []) > 1 and self.fixed_template(): raise SameFileError(self.params['outtmpl']) for video in videos or []: |