From 656b42a09b1db112cb031dc9fc967d92d5ad3b94 Mon Sep 17 00:00:00 2001 From: Adriaan Renting <renting@astron.nl> Date: Tue, 19 Aug 2008 12:15:26 +0000 Subject: [PATCH] Bug #1113: fixed bug if name of directory and file don't match --- .../scripts/CS1_Offline_pipeline_control.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Appl/CEP/CS1/CS1_pp_lib/scripts/CS1_Offline_pipeline_control.py b/Appl/CEP/CS1/CS1_pp_lib/scripts/CS1_Offline_pipeline_control.py index a3e8e8e8cae..eddf60f0653 100644 --- a/Appl/CEP/CS1/CS1_pp_lib/scripts/CS1_Offline_pipeline_control.py +++ b/Appl/CEP/CS1/CS1_pp_lib/scripts/CS1_Offline_pipeline_control.py @@ -51,10 +51,16 @@ def spawn(dest, src, log): '/CS1_Offline_pipeline_node.py') ##Run the node script on every node ## os.system('ssh -A -t ' + dest[0] + ' "cd /local/renting;time >> pipeline.log"') - os.system('ssh -A -t ' + dest[0] + ' "setenv PYTHONPATH /app/LOFAR/stable;' + - 'source /app/scripts/doStableAIPS++; cd '+ dest[1] + ';python ' + - 'CS1_Offline_pipeline_node.py -r' + src[0] + ' -m' + src[1] + ' -d' + dest[0] + - ' -l' + log + ' >> pipeline.log"') + if src[0]: + os.system('ssh -A -t ' + dest[0] + ' "setenv PYTHONPATH /app/LOFAR/stable;' + + 'source /app/scripts/doStableAIPS++; cd '+ dest[1] + ';python ' + + 'CS1_Offline_pipeline_node.py -r' + src[0] + ' -m' + src[1] + ' -d' + dest[0] + + ' -l' + log + ' >> pipeline.log"') + else: + os.system('ssh -A -t ' + dest[0] + ' "setenv PYTHONPATH /app/LOFAR/stable;' + + 'source /app/scripts/doStableAIPS++; cd '+ dest[1] + ';python ' + + 'CS1_Offline_pipeline_node.py -m' + src[1] + ' -d' + dest[0] + + ' -l' + log + ' >> pipeline.log"') ## bash version for Pandey ## os.system('ssh -A -t ' + dest[0] + ' "export PYTHONPATH=/app/LOFAR/stable;' + ## '. /app/aips++/Unstable/aipsinit.sh; cd '+ dest[1] + ';python ' + -- GitLab