Merge branch 'bugs-3855-3' into 'master'

fix bugs in MR 826, blocking EMI-ES submission

See merge request !837

src/hed/libs/common/FileUtils.cpp

@@ -472,7 +472,7 @@ bool DirDeleteExcl(const std::string& path, const std::list<std::string>& files,
     // Check for file or dir
     struct stat st;
     if (!FileStat(*d, &st, uid, gid, false)) return false;
-      if (S_ISDIR(st.st_mode)) {
+    if (S_ISDIR(st.st_mode)) {
       // Check for any files in this dir
       std::list<std::string> newfiles;
       for (std::list<std::string>::const_iterator f = files.begin(); f != files.end(); ++f) {

src/services/a-rex/grid-manager/jobs/DTRGenerator.cpp

@@ -604,7 +604,11 @@ bool DTRGenerator::processReceivedDTR(DataStaging::DTR_ptr dtr) {
       logger.msg(Arc::WARNING, "%s: Failed to read list of input files, can't clean up session dir", jobid);
     else {
       std::list<std::string> todelete(files.size());
-      std::transform(files.begin(), files.end(), todelete.begin(), filedata_pfn);
+      for (std::list<FileData>::const_iterator f = files.begin(); f != files.end(); ++f) {
+        if (f->lfn.find(':') != std::string::npos) {
+          todelete.push_back(f->pfn);
+        }
+      }
       if (!Arc::DirDeleteExcl(job->SessionDir(), todelete, false, job_uid, job_gid)) {
         logger.msg(Arc::WARNING, "%s: Failed to clean up session dir", jobid);
       }
@@ -721,7 +725,11 @@ bool DTRGenerator::processReceivedJob(GMJobRef& job) {
     }
     // pre-clean session dir before downloading
     std::list<std::string> todelete(files.size());
-    std::transform(files.begin(), files.end(), todelete.begin(), filedata_pfn);
+    for (std::list<FileData>::const_iterator f = files.begin(); f != files.end(); ++f) {
+      if (f->lfn.find(':') != std::string::npos) {
+        todelete.push_back(f->pfn);
+      }
+    }
     if (!Arc::DirDeleteExcl(job->SessionDir(), todelete, false, job_uid, job_gid)) {
       logger.msg(Arc::ERROR, "%s: Failed to clean up session dir", jobid);
       dtrs_lock.lock();