From 818d2670ee6fedf57037fc4fba0b4e22d0bee1b9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 10 Sep 2009 17:13:55 -0600 Subject: [PATCH] Ignore invalid proxies --- setup/installer/linux/freeze.py | 5 ++--- src/calibre/__init__.py | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/setup/installer/linux/freeze.py b/setup/installer/linux/freeze.py index bbdf6be18c..b239ff601b 100644 --- a/setup/installer/linux/freeze.py +++ b/setup/installer/linux/freeze.py @@ -46,13 +46,12 @@ class LinuxFreeze(Command): '/lib/libz.so.1', '/usr/lib/libtiff.so.3', '/lib/libbz2.so.1', - '/usr/lib/libpoppler.so.4', + '/usr/lib/libpoppler.so.5', '/usr/lib/libpoppler-qt4.so.3', '/usr/lib/libxml2.so.2', '/usr/lib/libopenjpeg.so.2', '/usr/lib/libxslt.so.1', - '/usr/lib64/libjpeg.so.7'.replace('64', '64' if is64bit - else ''), + '/usr/lib/libjpeg.so.7', '/usr/lib/libxslt.so.1', '/usr/lib/libgthread-2.0.so.0', '/usr/lib/gcc/***-pc-linux-gnu/4.4.1/libstdc++.so.6'.replace('***', diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 991a5d584e..ae5946bcb3 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -221,9 +221,13 @@ def get_proxies(): proxies['ftp'] = server settings.Close() 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: - print('Using proxies: %s' % proxies) + prints('Using proxies: %s' % proxies) return proxies