Merge branch 'release/2.1.4'

thespacedoctor · Jun 18, 2020 · fe7624a · fe7624a
2 parents 967b0ee + 60e999f
commit fe7624a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,10 @@
 
 ## Release Notes
 
+**v2.1.4 - June 18, 2020**
+
+* **fixed**: an empty crossmatch set could cause a transient database update when not required
+
 **v2.1.3 - June 5, 2020**
 
 * **refactor**: stop sherlock checking for transient database triggers if running in non-update mode

diff --git a/sherlock/__version__.py b/sherlock/__version__.py
@@ -1 +1 @@
-__version__ = '2.1.3'
+__version__ = '2.1.4'
diff --git a/sherlock/transient_classifier.py b/sherlock/transient_classifier.py
@@ -1414,7 +1414,7 @@ def update_classification_annotations_and_summaries(
         # print "COLLECTING TRANSIENTS WITH NO ANNOTATIONS"
 
         # BULK RUN
-        if not crossmatches:
+        if crossmatches == False:
             if updatePeakMagnitudes:
                 sqlQuery = u"""
                     SELECT * from sherlock_crossmatches cm, sherlock_classifications cl where rank =1 and cl.transient_object_id= cm.transient_object_id and ((cl.classification not in ("AGN","CV","BS","VS") AND cm.dateLastModified > DATE_SUB(NOW(), INTERVAL 1 Day))  or cl.annotation is null)