Merge branch 'master' of https://github.com/christopherwharrop/rocoto

christopherwharrop · Aug 24, 2017 · 51cb2e7 · 51cb2e7
2 parents 84ceaa7 + 68a7ecd
commit 51cb2e7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/workflowmgr/lsfbatchsystem.rb b/lib/workflowmgr/lsfbatchsystem.rb
@@ -556,7 +556,8 @@ def run_bhist_bjobs(nacctfiles=1,bjobs=true)
         recordstring.gsub!(/\n\s{3,}/,'')
         recordstring.split(/\n+/).each { |event|
           case event.strip
-            when /^Job <(\d+)>, *(Job Name <([^>]+)>,)? *User <([^>]+)>,/
+#Job <216811>, Job Name <rt_test_gsm_t126_mom5_cice5_2015040100_2day_cold>, User<emc.nemspara>, Project <GFS-T2O>,
+            when /^Job *<(\d+)>, *(Job Name *<([^>]+)>,)? *User *<([^>]+)>,/
               record[:jobid]=$1
               record[:jobname]=$3
               record[:user]=$4