build_scan: Fix exception handling

scripts/slave/build_scan.py

Index: scripts/slave/build_scan.py
diff --git a/scripts/slave/build_scan.py b/scripts/slave/build_scan.py
index e33b3bd0b3cc6cc48d4146ae91c1aa725899cda2..ff02c873ef307a5c29acb6ddb500a00a7462f9c6 100755
--- a/scripts/slave/build_scan.py
+++ b/scripts/slave/build_scan.py
@@ -161,7 +161,15 @@ def get_build_json(url_tuple):
         CBE_URL, name, urllib.quote(builder), buildnum)
 
   logging.debug('opening %s...' % url)
-  return _url_open_json(url), master, builder, buildnum
+  try:

[ghost stip (do not use), 2016/10/28 20:34:01]

put this in _url_open_json() instead

[martiniss, 2016/10/28 20:42:29]

Done.

+    return _url_open_json(url), master, builder, buildnum
+  except (urllib2.URLError, IOError) as f:
+    # Catch this and raise a ValueError because this can be called from
+    # mulitprocessing, which can't pickle SSLContext objects, which apparently are
+    # properties of urllib2.URLError (it seems).
+    msg = "Error encountered during URL Fetch: %s" % f
+    logging.error(msg)
+    raise ValueError(msg)
 
 
 def get_build_jsons(master_builds, processes):
@@ -236,19 +244,11 @@ def get_options():
 
 
 def get_updated_builds(masters, build_db, parallelism):
-  try:
-    new_builds, master_jsons = find_new_builds_per_master(masters, build_db)
-    build_jsons = get_build_jsons(new_builds, parallelism)
-    propagate_build_json_to_db(build_db, build_jsons)
-    return master_jsons, build_jsons
-
-  # Catch this and raise a ValueError because this can be called from
-  # mulitprocessing, which can't pickle SSLContext objects, which apparently are
-  # properties of urllib2.URLError (it seems).
-  except (urllib2.URLError, IOError) as f:
-    msg = "Error encountered during URL Fetch: %s" % f
-    logging.error(msg)
-    raise ValueError(msg)
+  new_builds, master_jsons = find_new_builds_per_master(masters, build_db)
+  build_jsons = get_build_jsons(new_builds, parallelism)
+  propagate_build_json_to_db(build_db, build_jsons)
+  return master_jsons, build_jsons
+
 
 
 def main():