2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d20c3481acb6/ Changeset: d20c3481acb6 User: greg Date: 2013-06-18 15:44:13 Summary: Fix for handing comments as the last element in a set_environment tag set in tool dependency definitions. Contributed by Adam Novak. Affected #: 1 file diff -r 7a6bc7485be9da1b07ac5bf8d9d62dcff327b5ba -r d20c3481acb6581b239b20a34078f927dcc2a3c2 lib/tool_shed/galaxy_install/tool_dependencies/install_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py @@ -431,7 +431,8 @@ if env_var_dict: env_var_dicts.append( env_var_dict ) if env_var_dicts: - action_dict[ env_elem.tag ] = env_var_dicts + # The last child of an <action type="set_environment"> might be a comment, so manually set it to be 'environment_variable'. + action_dict[ 'environment_variable' ] = env_var_dicts else: continue elif action_type == 'set_environment_for_install': https://bitbucket.org/galaxy/galaxy-central/commits/ddeb00845879/ Changeset: ddeb00845879 Branch: stable User: greg Date: 2013-06-18 15:44:13 Summary: Fix for handing comments as the last element in a set_environment tag set in tool dependency definitions. Contributed by Adam Novak. Affected #: 1 file diff -r f295092476c781987d5a31e44e7a19a372a461aa -r ddeb0084587994c3a0b9d1504950b4639ab7e7e8 lib/tool_shed/galaxy_install/tool_dependencies/install_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py @@ -431,7 +431,8 @@ if env_var_dict: env_var_dicts.append( env_var_dict ) if env_var_dicts: - action_dict[ env_elem.tag ] = env_var_dicts + # The last child of an <action type="set_environment"> might be a comment, so manually set it to be 'environment_variable'. + action_dict[ 'environment_variable' ] = env_var_dicts else: continue elif action_type == 'set_environment_for_install': Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.