Improve cookie error handling

This commit is contained in:
Philipp Hagemeister 2013-02-02 13:51:54 +01:00
parent 0e33684194
commit 229cac754a

View File

@ -290,10 +290,13 @@ def _real_main():
else: else:
try: try:
jar = compat_cookiejar.MozillaCookieJar(opts.cookiefile) 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() jar.load()
except (IOError, OSError) as err: 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 # Set user agent
if opts.user_agent is not None: if opts.user_agent is not None:
std_headers['User-Agent'] = opts.user_agent std_headers['User-Agent'] = opts.user_agent