commit 1d608b170da6c72df783a44aa4e8144d1b8ca084
parent 7f4032667fc82086bf7355b7e09049eba3ce2986
Author: Nick Mathewson <nickm@torproject.org>
Date: Sun, 15 Apr 2007 04:56:34 +0000
r12375@catbus: nickm | 2007-04-15 00:56:27 -0400
Catch badly-formatted URLs when downloading, not just URLS that fail when downloading.
svn:r210
Diffstat:
1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/updateCache.py b/updateCache.py
@@ -16,6 +16,7 @@ import urllib2
import getopt
import socket
import errno
+import httplib
os.umask(022)
@@ -55,6 +56,8 @@ def downloadFile(key, ftype, section, url,timeout=None):
try:
try:
infile = urllib2.urlopen(url)
+ except httplib.InvalidURL, e:
+ raise UIError("Invalid URL %s: %s"%(url,e))
except IOError, e:
raise UIError("Cannot connect to url %s: %s"%(url,e))
except socket.error, e: