From 333a62fcfd1207ba2aee8b6c69521150821a1274 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Mon, 30 Mar 2015 15:46:15 -0500 Subject: [PATCH 1/2] Fix condor_submit syntax error --- src/scripts/condor_submit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/condor_submit.sh b/src/scripts/condor_submit.sh index 334c85fe..c96595bf 100755 --- a/src/scripts/condor_submit.sh +++ b/src/scripts/condor_submit.sh @@ -183,7 +183,7 @@ if [ ${#remap_files[@]} -gt 0 ] ; then if [ ! -z "${remap_files[0]}" ] ; then map=${remap_files[$i]} else - map=${output_files$i]} + map=${output_files[$i]} fi transfer_output_remaps="$transfer_output_remaps;${output_files[$i]}=$map" done From 0a03709d05d6f74e16dcbe1dce82fe8bc318535d Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Thu, 21 May 2015 13:53:26 -0500 Subject: [PATCH 2/2] Apply gittrac #5041: Blahp should check for empty job id from qsub https://htcondor-wiki.cs.wisc.edu/index.cgi/tktview?tn=5041 --- src/scripts/pbs_submit.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/scripts/pbs_submit.sh b/src/scripts/pbs_submit.sh index e3ad4cda..67a536a7 100755 --- a/src/scripts/pbs_submit.sh +++ b/src/scripts/pbs_submit.sh @@ -213,6 +213,12 @@ fi # The job id is actually the first numbers in the string (slurm support) jobID=`echo $jobID | awk 'match($0,/[0-9]+/){print substr($0, RSTART, RLENGTH)}'` +if [ "X$jobID" == "X" ]; then + rm -f $bls_tmp_file + echo "Error: job id missing" >&2 + echo Error # for the sake of waiting fgets in blahpd + exit 1 +fi if [ "x$pbs_nologaccess" != "xyes" -a "x$pbs_nochecksubmission" != "xyes" ]; then