From 0f7e3c43bd13d26f5aea269342165e4f4d484619 Mon Sep 17 00:00:00 2001
From: Christopher Harrop <christopher.w.harrop@noaa.gov>
Date: Tue, 28 Apr 2015 18:19:53 +0000
Subject: [PATCH] Bug fix for LSF.

The LSB_PJL_TASK_GEOMETRY variable was not set properly.
Fixed quoting of env values as well.
---
 lib/workflowmgr/lsfbatchsystem.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/workflowmgr/lsfbatchsystem.rb b/lib/workflowmgr/lsfbatchsystem.rb
index 0ad7400..3664d84 100644
--- a/lib/workflowmgr/lsfbatchsystem.rb
+++ b/lib/workflowmgr/lsfbatchsystem.rb
@@ -110,7 +110,7 @@ def submit(task)
         if env.nil?
           envstr += "export #{name}\n"
         else
-          envstr += "export #{name}=#{env}\n"
+          envstr += "export #{name}='#{env}'\n"
         end
       }
 
@@ -169,7 +169,7 @@ def submit(task)
               end
               cmd += " -R span[ptile=#{span}]"
               cmd += " -n #{nval}"
-              envstr += "export #{ROCOTO_TASK_GEO}=#{task_geometry}\n"
+              envstr += "export ROCOTO_TASK_GEO='#{task_geometry}'\n"
             end
           when :nodes
             # Get largest ppn*tpp to calculate ptile
@@ -212,7 +212,8 @@ def submit(task)
             cmd += " -n #{nnodes*ptile}"
  
             # Setenv the LSB_PJL_TASK_GEOMETRY to specify task layout
-            envstr += "export #{ROCOTO_TASK_GEO}=#{task_geometry}\n"
+            envstr += "export ROCOTO_TASK_GEO='#{task_geometry}'\n"
+
           when :walltime
             hhmm=WorkflowMgr.seconds_to_hhmm(WorkflowMgr.ddhhmmss_to_seconds(value))
             cmd += " -W #{hhmm}"