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

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-02-24 09:49:14 +05:30
parent d3a01fc18e
commit 0ff4a12538
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup/linux-installer.py
View File

@ -531,7 +531,7 @@ def get_https_resource_securely(url, timeout=60, max_redirects=5, ssl_version=No
f.flush() f.flush()
p = urlparse(url) p = urlparse(url)
if p.scheme != 'https': if p.scheme != 'https':
raise ValueError('URL scheme must be https, not %s' % p.scheme) raise ValueError('URL %s scheme must be https, not %r' % (url, p.scheme))
hostname, port = p.hostname, p.port hostname, port = p.hostname, p.port
proxies = get_proxies() proxies = get_proxies()
@ -585,7 +585,7 @@ def get_tarball_info():
global signature, calibre_version global signature, calibre_version
print ('Downloading tarball signature securely...') print ('Downloading tarball signature securely...')
raw = get_https_resource_securely('https://status.calibre-ebook.com/tarball-info/' + raw = get_https_resource_securely('https://status.calibre-ebook.com/tarball-info/' +
'x86_64' if is64bit else 'i686') ('x86_64' if is64bit else 'i686'))
signature, calibre_version = (x.decode('ascii') for x in raw.rpartition(b'@')[::2]) signature, calibre_version = (x.decode('ascii') for x in raw.rpartition(b'@')[::2])
if not signature or not calibre_version: if not signature or not calibre_version:
raise ValueError('Failed to get install file signature, invalid signature returned') raise ValueError('Failed to get install file signature, invalid signature returned')
@ -655,5 +655,5 @@ except NameError:
from_file = False from_file = False
if __name__ == '__main__' and from_file: if __name__ == '__main__' and from_file:
# curl '-Lf#' https://github.com/kovidgoyal/calibre/raw/master/setup/linux-installer.py | sudo INSTALL_DIR=/opt python -c "import sys; exec(sys.stdin.read()); main()" # noqa # wget -qO- https://github.com/kovidgoyal/calibre/raw/master/setup/linux-installer.py | sudo INSTALL_DIR=/opt python -c "import sys; exec(sys.stdin.read()); main()" # noqa
main() main()

2
src/calibre/utils/https.py
View File

@ -163,7 +163,7 @@ def get_https_resource_securely(
cacerts = P(cacerts, allow_user_override=False) cacerts = P(cacerts, allow_user_override=False)
p = urlparse(url) p = urlparse(url)
if p.scheme != 'https': if p.scheme != 'https':
raise ValueError('URL scheme must be https, not %s' % p.scheme) raise ValueError('URL %s scheme must be https, not %r' % (url, p.scheme))
hostname, port = p.hostname, p.port hostname, port = p.hostname, p.port
proxies = get_proxies() proxies = get_proxies()