From 5364626e07e5f1c9911d877d0eca06b2ebe060dd Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 9 Aug 2013 22:47:35 +0000
Subject: Fix error handling.

svn path=/trunk/; revision=51240
---
 tools/make-services.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/make-services.py b/tools/make-services.py
index 4753e727ef..7ea2636fe3 100755
--- a/tools/make-services.py
+++ b/tools/make-services.py
@@ -114,9 +114,9 @@ def parse_rows(svc_fd):
 
 def exit_msg(msg=None, status=1):
     if msg is not None:
-        sys.stderr.write(msg + '\n')
+        sys.stderr.write(msg + '\n\n')
     sys.stderr.write(__doc__ + '\n')
-    sys.exit(1)
+    sys.exit(status)
 
 def main(argv):
     try:
@@ -138,12 +138,12 @@ def main(argv):
         else:
             req = urllib.request.urlopen(svc_url)
             svc_fd = codecs.getreader('utf8')(req)
-    except URLError:
-        exit_err(URLError)
+    except:
+        exit_msg('Error opening ' + svc_url)
 
     body = parse_rows(svc_fd)
     if len(body) < min_body_size:
-        exit_err('Not enough parsed data')
+        exit_msg('Not enough parsed data')
 
     out = open(services_file, 'w')
     out.write('''\
-- 
cgit v1.2.1