From bc2ace9b9c5b06e6f6c9eb968acadef5a4cd2d49 Mon Sep 17 00:00:00 2001
From: James Taylor <james@jamestaylor.org>
Date: Fri, 11 Sep 2009 12:48:33 -0400
Subject: [PATCH] Fix syntax error when running workflows. This is actually a
 regression in Mako, the multiline conditional in the elif was somehow causing
 it to improperly nest the if statements

---
 eggs.ini                    | 4 ++--
 templates/workflow/run.mako | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/eggs.ini b/eggs.ini
index b55d36d1628..faac8f22cca 100644
--- a/eggs.ini
+++ b/eggs.ini
@@ -31,7 +31,7 @@ docutils = 0.4
 elementtree = 1.2.6_20050316
 lrucache = 0.2
 ;lsprof - james
-Mako = 0.2.4
+Mako = 0.2.5
 MyghtyUtils = 0.52
 nose = 0.9.1
 NoseHTML = 0.2
@@ -79,7 +79,7 @@ Beaker = http://cheeseshop.python.org/packages/source/B/Beaker/Beaker-1.4.tar.gz
 docutils = http://downloads.sourceforge.net/docutils/docutils-0.4.tar.gz
 elementtree = http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz
 lrucache = http://evan.prodromou.name/lrucache/lrucache-0.2.tar.gz
-Mako = http://www.makotemplates.org/downloads/Mako-0.2.4.tar.gz
+Mako = http://www.makotemplates.org/downloads/Mako-0.2.5.tar.gz
 MyghtyUtils = http://cheeseshop.python.org/packages/source/M/MyghtyUtils/MyghtyUtils-0.52.zip
 nose = http://www.somethingaboutorange.com/mrl/projects/nose/nose-0.9.1.tar.gz
 NoseHTML = http://dist.g2.bx.psu.edu/nosehtml-0.2.tar.bz2
diff --git a/templates/workflow/run.mako b/templates/workflow/run.mako
index 86374ed4173..28211fffba0 100644
--- a/templates/workflow/run.mako
+++ b/templates/workflow/run.mako
@@ -87,8 +87,7 @@ from galaxy.tools.parameters import DataToolParameter, RuntimeValue
                     ${param.get_html_field( t, value, other_values ).get_html( str(step.id) + "|" + prefix )}
                     <input type="hidden" name="${step.id}|__force_update__${prefix}${param.name}" value="true" />
                 %endif
-            %elif isinstance( value, RuntimeValue ) or \
-                  ( str(step.id) + '|__runtime__' + prefix + param.name ) in incoming:
+            %elif isinstance( value, RuntimeValue ) or ( str(step.id) + '|__runtime__' + prefix + param.name ) in incoming:
                 ## On the first load we may see a RuntimeValue, so we write
                 ## an input field using the initial value for the param.
                 ## Subsequents posts will no longer have the runtime value