1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/736555674763/ Changeset: 736555674763 User: Dave Bouvier Date: 2013-09-26 18:03:54 Summary: Eliminate use of features that are specific to ElementTree 1.3, introduced in python 2.7. Affected #: 1 file
diff -r 0b955e54451cf22a1a7c8fa0f92beb9e375f1f1e -r 736555674763159f1422c1c822e93019ed6a62ed lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py @@ -264,11 +264,13 @@ in_actions_group = True # Record the number of <actions> elements so we can filter out any <action> elements that precede <actions> elements. actions_elem_count = len( elem.findall( 'actions' ) ) - # Record the number of <actions> elements that have architecture and os specified, in order to filter out any platform-independent - # <actions> elements that come before platform-specific <actions> elements. This call to elem.findall is filtered by tags that have - # both the os and architecture specified. For more details, see http://docs.python.org/2/library/xml.etree.elementtree.html Section - # 19.7.2.1. - platform_actions_element_count = len( elem.findall( 'actions[@architecture][@os]' ) ) + # Record the number of <actions> elements that have both architecture and os specified, in order to filter out any + # platform-independent <actions> elements that come before platform-specific <actions> elements. + platform_actions_elements = [] + for actions_elem in elem.findall( 'actions' ): + if actions_elem.get( 'architecture' ) is not None and actions_elem.get( 'os' ) is not None: + platform_actions_elements.append( actions_elem ) + platform_actions_element_count = len( platform_actions_elements ) platform_actions_elements_processed = 0 actions_elems_processed = 0 # The tag sets that will go into the after_install_actions list are <action> tags instead of <actions> tags. These will be processed
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.