fixing broken deletion of input files in merge by hltd

v1.9.3-1
cmsdaq · Mar 14, 2016 · df74bb2 · df74bb2
1 parent a1d780c
commit df74bb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/python/aUtils.py b/python/aUtils.py
@@ -588,9 +588,11 @@ def mergeDatInputs(self,destinationpath,doChecksum):
         #delete input files
         for input in self.inputs:
             ifile = input.getFieldByName('Filelist')
-            if nproc==0:continue
-            try:os.remove(ifile)
-            except:pass
+            if not ifile:
+              continue
+            try:os.remove(os.path.join(dirname,ifile))
+            except Exception as ex:
+              self.logger.exception(ex)
 
         self.setFieldByName("Filesize",json_size)
         if doChecksum:

diff --git a/scripts/hltdrpm.sh b/scripts/hltdrpm.sh
@@ -209,7 +209,7 @@ cd $TOPDIR
 cat > hltd.spec <<EOF
 Name: hltd
 Version: 1.9.3
-Release: 0
+Release: 1
 Summary: hlt daemon
 License: gpl
 Group: DAQ