From 78aa9d1874fd6d9590fbb1b673e0ca70dade9f29 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Fri, 31 May 2013 07:50:21 +0100 Subject: [PATCH] Don't hang or crash in checkupdates --- fdroidserver/checkupdates.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index 713ad6bd..282471b0 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -173,7 +173,7 @@ def check_market(app): headers = {'User-Agent' : 'Mozilla/5.0 (X11; Linux i686; rv:18.0) Gecko/20100101 Firefox/18.0'} req = urllib2.Request(url, None, headers) try: - resp = urllib2.urlopen(req) + resp = urllib2.urlopen(req, None, 20) except urllib2.HTTPError, e: if e.code == 404: return (None, 'Not in market') @@ -182,6 +182,8 @@ def check_market(app): sys.exit(1) else: return (None, 'Failed with HTTP status' + str(req.getcode())) + except Exception, e: + return (None, 'Failed:' + str(e)) page = resp.read() version = None -- 2.30.2