youtube-dl

commit d61aefb24c96d8b45aed63cfdcfec0c157a24ba5
parent d305dd73a3d6927f0a2c63d08662a183fa173833
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Thu, 19 Feb 2015 00:01:14 +0100

Merge remote-tracking branch 'origin/master'

Diffstat:
M
youtube_dl/extractor/vimeo.py
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py
@@ -175,7 +175,7 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor):
     def _verify_video_password(self, url, video_id, webpage):
         password = self._downloader.params.get('videopassword', None)
         if password is None:
-            raise ExtractorError('This video is protected by a password, use the --video-password option')
+            raise ExtractorError('This video is protected by a password, use the --video-password option', expected=True)
         token = self._search_regex(r'xsrft: \'(.*?)\'', webpage, 'login token')
         data = compat_urllib_parse.urlencode({
             'password': password,