1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4eba60282f9d/ Changeset: 4eba60282f9d User: greg Date: 2014-06-19 23:46:04 Summary: Fix for handling complex repository dependency definitions that contain recipes that include <package> tag sets that define dependencies needed only for compiling the dependent package. Affected #: 1 file diff -r d64ce44b0d0dc5fcf9978f6047fe78ef946165dc -r 4eba60282f9d06ce6123478ea1bfa1f9ec741f45 lib/tool_shed/util/commit_util.py --- a/lib/tool_shed/util/commit_util.py +++ b/lib/tool_shed/util/commit_util.py @@ -130,7 +130,6 @@ Populate or unpopulate the toolshed and changeset_revision attributes of a <repository> tag that defines a complex repository dependency. """ - # The received sub_elem looks something like the following: # <repository name="package_eigen_2_0" owner="test" prior_installation_required="True" /> revised, repository_elem, error_message = handle_repository_dependency_elem( app, sub_elem, unpopulate=unpopulate ) if error_message: @@ -432,22 +431,24 @@ for last_actions_index, last_actions_elem in enumerate( actions_group_elem ): last_actions_package_altered = False if last_actions_elem.tag == 'package': + last_actions_elem_package_elem_altered = False for last_actions_elem_package_index, last_actions_elem_package_elem in enumerate( last_actions_elem ): if last_actions_elem_package_elem.tag == 'repository': # We have a complex repository dependency. - altered, last_actions_package_altered, last_actions_elem, message = \ + last_actions_package_altered, last_actions_elem_package_elem_altered, last_actions_elem, message = \ handle_complex_repository_dependency_elem( app, last_actions_elem, last_actions_elem_package_index, last_actions_elem_package_elem, + last_actions_elem_package_elem_altered, last_actions_package_altered, - altered, unpopulate=unpopulate ) + if not altered and last_actions_package_altered: + altered = True if message: error_message += message - if last_actions_package_altered: - last_actions_elem[ last_actions_elem_package_index ] = last_actions_elem_package_elem - actions_group_elem[ last_actions_index ] = last_actions_elem + if last_actions_elem_package_elem_altered: + actions_group_elem[ last_actions_index ] = last_actions_elem else: # Inspect the sub elements of last_actions_elem to locate all <repository> tags and # populate them with toolshed and changeset_revision attributes if necessary. 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.