From 3c1b147437f6d1a3dea83fa5d4c10d315095b9b4 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Mon, 5 Aug 2013 17:22:18 +0200
Subject: better exception handling

---
 bin/updater.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/updater.py b/bin/updater.py
index 5c83b98b0..a5ff0042d 100644
--- a/bin/updater.py
+++ b/bin/updater.py
@@ -104,13 +104,10 @@ class Updater:
             time.sleep(self.interval)
             self.run()
 
-        except ValueError:
-            print('%s is not a valid URL' % self.base_url)
-        except urllib.error.HTTPError:
-            print('%s does not exist' % self.base_url)
+        except (ValueError, urllib.error.HTTPError) as e:
+            print('%s: %s' % (self.base_url, e))
             exit(1)
 
-
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('--threads',
@@ -132,7 +129,7 @@ def main():
 
     # register user and password for a certain url
     auth = urllib.request.HTTPPasswordMgrWithDefaultRealm()
-    auth.add_password("Authorisation Required", args.url, args.user, args.password)
+    auth.add_password(None, args.url, args.user, args.password)
     auth_handler = urllib.request.HTTPBasicAuthHandler(auth)
     opener = urllib.request.build_opener(auth_handler)
     urllib.request.install_opener(opener)
-- 
cgit v1.2.3