Changeset 32139

Timestamp:

Aug 19, 2011, 11:45:38 AM (15 years ago)

Author:

rhenders

Message:

remove() method is now returning true if the batch is not found on the datastore; log messged demoted to 'debug' from 'info'

File:

• trunk/ippToPsps/jython/datastore.py (modified) (3 diffs)

trunk/ippToPsps/jython/datastore.py

@@ -5 +5 @@
 import logging
 import sys
+import re
 from xml.etree.ElementTree import ElementTree, Element, tostring
 
@@ -63 +64 @@
     '''
     Removes an item from the datastore
+
+    NB this will return a success if the batch is not found on the datastore
     '''
     def remove(self, name):
@@ -71 +74 @@
                    --product " + self.product
 
-        p = Popen(command, shell=True, stdout=PIPE)
+        p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
         p.wait()
+        output, errors = p.communicate()
 
         if p.returncode != 0:
-            self.logger.errorPair("Datastore removal failed",  name)
-            ret = False
+            if re.search("not found in", errors):
+                self.logger.debugPair("Datastore batch not found", name)
+                ret = True
+            else:
+                self.logger.debugPair("Datastore removal FAILED", name)
+                ret = False
         else:
+            self.logger.debugPair("Datastore removal successful", name)
             ret = True
-            self.logger.infoPair("Datastore removal successful", name)
             
         return ret