Skip local Terminate if there was a merging+terminate job

diff --git a/ANALYSIS/AliAnalysisAlien.cxx b/ANALYSIS/AliAnalysisAlien.cxx
index f614c802badcfc319b52bc95b248c58f35124aa5..e1d8d7ce58fca3c438e09b9e504770c04416b5e6 100644 (file)
--- a/ANALYSIS/AliAnalysisAlien.cxx
+++ b/ANALYSIS/AliAnalysisAlien.cxx
@@ -1624,7 +1624,8 @@ Bool_t AliAnalysisAlien::MergeOutputs()
       Info("MergeOutputs", "Submitting merging JDL");
       SubmitMerging();
       Info("MergeOutputs", "### Re-run with <MergeViaJDL> off to collect results after merging jobs are done ###");
-      Info("MergeOutputs", "### Trying to continue merging ... (may fail if exited the shell prematurely)");
+      Info("MergeOutputs", "### Not executing Terminate for now. This is not an error.");
+      return kFALSE;
    }   
    // Get the output path
    if (!fGridOutputDir.Contains("/")) fGridOutputDir = Form("/%s/%s/%s", gGrid->GetHomeDirectory(), fGridWorkingDir.Data(), fGridOutputDir.Data());