From 229cac754aa134d6d14ea7f66904fcc95629c1f1 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 2 Feb 2013 13:51:54 +0100
Subject: [PATCH] Improve cookie error handling
---
youtube_dl/__init__.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index bdab38a4e..7ed9bfc0d 100644
--- 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