Changeset 33557 for trunk

Timestamp:

Mar 16, 2012, 12:07:47 PM (14 years ago)

Author:

rhenders

Message:

try/catch around xml prettifying call; manifest creating method now returns boolean for success/failure

File:

• trunk/ippToPsps/jython/batch.py (modified) (2 diffs)

trunk/ippToPsps/jython/batch.py

@@ -262 +262 @@
 
         # clunky way to prettify XML
-        p = Popen("xmllint --format " + tmpPath + " > " + outPath, shell=True, stdout=PIPE)
-        p.wait()
-        os.remove(tmpPath)
+        try:
+            cmd = "xmllint --format " + tmpPath + " > " + outPath
+            p = Popen(cmd, shell=True, stdout=PIPE)
+            p.wait()
+        except:
+            self.logger.errorPair("Popen failed", cmd)
+            return False
+        finally: 
+            os.remove(tmpPath)
+
+        return True
 
 
@@ -528 +536 @@
                 self.logger.errorPair("Aborting this batch", "unable to export tables to FITS file")
             else:
-                self.writeBatchManifest()
-                if self.config.datastorePublishing: 
-                    # tar and zip ready for publication to datastore
-                    if self.tarAndZip():
-                        # now publish to the datastore
-                        tarballFile = Batch.getTarballFile(self.batchID)
-                        Batch.publishToDatastore(self.datastore, self.batchID, self.batchName, self.subDir, tarballFile)
+                if self.writeBatchManifest():
+                    if self.config.datastorePublishing: 
+                        # tar and zip ready for publication to datastore
+                        if self.tarAndZip():
+                            # now publish to the datastore
+                            tarballFile = Batch.getTarballFile(self.batchID)
+                            Batch.publishToDatastore(
+                                    self.datastore, 
+                                    self.batchID, 
+                                    self.batchName, 
+                                    self.subDir, 
+                                    tarballFile)
 
 from datastore import Datastore