Merge pull request #166 from brianhlin/sw2814_missing_entries

Fix traceback if JOB_ROUTER_ENTRIES not present (SOFTWARE-2814)

Author: brianhlin

src/verify_ce_config.py

@@ -18,7 +18,10 @@
 # Create dict whose values are lists of ads specified in the relevant JOB_ROUTER_* variables
 JOB_ROUTER_CONFIG = {}
 for attr in ['JOB_ROUTER_DEFAULTS', 'JOB_ROUTER_ENTRIES']:
-    ads = classad.parseAds(htcondor.param[attr])
+    try:
+        ads = classad.parseAds(htcondor.param[attr])
+    except KeyError:
+        sys.exit("ERROR: Missing required configuration: %s" % attr)
     JOB_ROUTER_CONFIG[attr] = list(ads) # store the ads (iterating through ClassAdStringIterator consumes them)
 
 # Verify job routes. classad.parseAds() ignores malformed ads so we have to compare the unparsed string to the