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

Ignore invalid proxies

Browse Source
This commit is contained in:
Kovid Goyal 2009-09-10 17:13:55 -06:00
parent eafc299289
commit 818d2670ee
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/installer/linux/freeze.py
View File

@ -46,13 +46,12 @@ class LinuxFreeze(Command):
'/lib/libz.so.1', '/lib/libz.so.1',
'/usr/lib/libtiff.so.3', '/usr/lib/libtiff.so.3',
'/lib/libbz2.so.1', '/lib/libbz2.so.1',
'/usr/lib/libpoppler.so.4', '/usr/lib/libpoppler.so.5',
'/usr/lib/libpoppler-qt4.so.3', '/usr/lib/libpoppler-qt4.so.3',
'/usr/lib/libxml2.so.2', '/usr/lib/libxml2.so.2',
'/usr/lib/libopenjpeg.so.2', '/usr/lib/libopenjpeg.so.2',
'/usr/lib/libxslt.so.1', '/usr/lib/libxslt.so.1',
'/usr/lib64/libjpeg.so.7'.replace('64', '64' if is64bit '/usr/lib/libjpeg.so.7',
else ''),
'/usr/lib/libxslt.so.1', '/usr/lib/libxslt.so.1',
'/usr/lib/libgthread-2.0.so.0', '/usr/lib/libgthread-2.0.so.0',
'/usr/lib/gcc/***-pc-linux-gnu/4.4.1/libstdc++.so.6'.replace('***', '/usr/lib/gcc/***-pc-linux-gnu/4.4.1/libstdc++.so.6'.replace('***',

8
src/calibre/__init__.py
View File

@ -221,9 +221,13 @@ def get_proxies():
proxies['ftp'] = server proxies['ftp'] = server
settings.Close() settings.Close()
except Exception, e: except Exception, e:
print('Unable to detect proxy settings: %s' % str(e)) prints('Unable to detect proxy settings: %s' % str(e))
for x in list(proxies):
if len(proxies[x]) < 5:
prints('Removing invalid', x, 'proxy:', proxies[x])
del proxies[x]
if proxies: if proxies:
print('Using proxies: %s' % proxies) prints('Using proxies: %s' % proxies)
return proxies return proxies