youtube-dl

commit 229cac754aa134d6d14ea7f66904fcc95629c1f1
parent 0e33684194c9e364c70e0da3400b9568fa636538
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Sat,  2 Feb 2013 13:51:54 +0100

Improve cookie error handling

Diffstat:
M
youtube_dl/__init__.py
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
@@ -290,10 +290,13 @@ def _real_main():
     else:
         try:
             jar = compat_cookiejar.MozillaCookieJar(opts.cookiefile)
-            if os.path.isfile(opts.cookiefile) and os.access(opts.cookiefile, os.R_OK):
+            if os.access(opts.cookiefile, os.R_OK):
                 jar.load()
         except (IOError, OSError) as err:
-            sys.exit(u'ERROR: unable to open cookie file')
+            if opts.verbose:
+                traceback.print_exc()
+            sys.stderr.write(u'ERROR: unable to open cookie file\n')
+            sys.exit(101)
     # Set user agent
     if opts.user_agent is not None:
         std_headers['User-Agent'] = opts.user_agent