Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

calibredb: Fix misleading error message when connecting to a server with incorrect username/password

Browse Source
This commit is contained in:
Kovid Goyal 2017-08-04 13:18:51 +05:30
parent 92c5529fab
commit 0866a75579
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/db/cli/main.py
View File

@ -119,7 +119,7 @@ For help on an individual command: %%prog command --help
) )
def read_credetials(opts): def read_credentials(opts):
username = opts.username username = opts.username
pw = opts.password pw = opts.password
if pw: if pw:
@ -148,7 +148,7 @@ class DBCtx(object):
self.url = urlunparse(parts._replace(fragment='')).rstrip('/') self.url = urlunparse(parts._replace(fragment='')).rstrip('/')
self.br = browser(handle_refresh=False, user_agent='{} {}'.format(__appname__, __version__)) self.br = browser(handle_refresh=False, user_agent='{} {}'.format(__appname__, __version__))
self.is_remote = True self.is_remote = True
username, password = read_credetials(opts) username, password = read_credentials(opts)
self.has_credentials = False self.has_credentials = False
if username and password: if username and password:
self.br.add_password(self.url, username, password) self.br.add_password(self.url, username, password)
@ -191,9 +191,11 @@ class DBCtx(object):
def interpret_http_error(self, err): def interpret_http_error(self, err):
if err.code == httplib.UNAUTHORIZED: if err.code == httplib.UNAUTHORIZED:
if self.has_credentials:
raise SystemExit('The username/password combination is incorrect')
raise SystemExit('A username and password is required to access this server') raise SystemExit('A username and password is required to access this server')
if err.code == httplib.FORBIDDEN: if err.code == httplib.FORBIDDEN:
raise SystemExit('The username/password combination is incorrect') raise SystemExit(err.reason)
if err.code == httplib.NOT_FOUND: if err.code == httplib.NOT_FOUND:
raise SystemExit(err.reason) raise SystemExit(err.reason)