From 49fd98455d7a4712a04d3c70c74ff800c6f750ea Mon Sep 17 00:00:00 2001 From: Stephen Boyle Date: Wed, 10 Oct 2018 11:59:50 -0400 Subject: [PATCH] Catch URLError Should not self-destrict if SSL cert is wrong etc. --- Makefile | 2 +- middleware_b2.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 554b10d..450321d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ include /usr/local/share/luggage/luggage.make TITLE=B2Middleware REVERSE_DOMAIN=com.github.sphen13.b2middleware -PACKAGE_VERSION=1.1 +PACKAGE_VERSION=1.2 PAYLOAD=pack-middleware\ pack-script-postinstall diff --git a/middleware_b2.py b/middleware_b2.py index d55c33c..aa9c680 100755 --- a/middleware_b2.py +++ b/middleware_b2.py @@ -23,7 +23,7 @@ from Foundation import kCFPreferencesAnyUser from Foundation import kCFPreferencesCurrentHost -__version__ = '1.1' +__version__ = '1.2' BUNDLE = 'ManagedInstalls' @@ -65,6 +65,10 @@ def authorize_b2(account_id, application_key): # we got an error - return None print ('B2-Middleware: HTTPError ' + str(e.code)) return None, None, None, None + except urllib2.URLError, e: + # we got an error - return None + print ('B2-Middleware: URLError ' + str(e)) + return None, None, None, None response_data = json.loads(response.read()) response.close()