Fix crashing on partial pipeline runs.

lsst · Nov 8, 2017 · c65621e · c65621e
1 parent 4a754db
commit c65621e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/python/lsst/ap/verify/pipeline_driver.py b/python/lsst/ap/verify/pipeline_driver.py
@@ -30,6 +30,7 @@
 import json
 
 import lsst.log
+import lsst.daf.base as dafBase
 import lsst.ap.pipe as ap_pipe
 from lsst.verify import Job
 
@@ -289,7 +290,9 @@ def run_ap_pipe(dataset, working_repo, parsed_cmd_line, metrics_job):
     """
     log = lsst.log.Log.getLogger('ap.verify.pipeline_driver.run_ap_pipe')
 
-    metadata = _ingest_raws(dataset, working_repo, metrics_job)
+    # Easiest way to defend against None return values
+    metadata = dafBase.PropertySet()
+    metadata.combine(_ingest_raws(dataset, working_repo, metrics_job))
     metadata.combine(_ingest_calibs(dataset, working_repo, metrics_job))
     log.info('Data ingested')