2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6b4b91d27c33/ Changeset: 6b4b91d27c33 Branch: next-stable User: Dave Bouvier Date: 2013-05-28 20:49:19 Summary: Explicitly filter by tag name actions when building the actions dict for tool dependency installation. Affected #: 1 file diff -r 412b9edb65ec78b029cae0969956b194c16ac053 -r 6b4b91d27c3316960ae0e65bfb7c87371831be41 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 @@ -339,7 +339,8 @@ actions_dict[ 'package_name' ] = package_name actions = [] all_env_shell_file_paths = [] - for action_elem in actions_elem: + # Make sure to skip all comments, since they are now included in the XML tree. + for action_elem in actions_elem.findall( 'action' ): action_dict = {} action_type = action_elem.get( 'type', 'shell_command' ) if action_type == 'shell_command': https://bitbucket.org/galaxy/galaxy-central/commits/c3199d306781/ Changeset: c3199d306781 User: Dave Bouvier Date: 2013-05-28 20:51:18 Summary: Merge with next-stable. Affected #: 1 file diff -r 79d036fbc175dc9e8eeb3c3a8e57352ded1fbbbf -r c3199d306781ce61ce121a2c34c846310dac74c7 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 @@ -339,7 +339,8 @@ actions_dict[ 'package_name' ] = package_name actions = [] all_env_shell_file_paths = [] - for action_elem in actions_elem: + # Make sure to skip all comments, since they are now included in the XML tree. + for action_elem in actions_elem.findall( 'action' ): action_dict = {} action_type = action_elem.get( 'type', 'shell_command' ) if action_type == 'shell_command': 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.