commit/galaxy-central: greg: Don't generate error messages when resetting metadata on installed tool shed repositories that have repository dependencies that are not installed because they were not needed for compiling the dependent repository's tool dependency.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/04a3137539d2/ Changeset: 04a3137539d2 User: greg Date: 2013-09-10 19:29:18 Summary: Don't generate error messages when resetting metadata on installed tool shed repositories that have repository dependencies that are not installed because they were not needed for compiling the dependent repository's tool dependency. Affected #: 1 file diff -r 1e30cdb6d3b82a68da8daddc86411eecc33be444 -r 04a3137539d245fa294f73f8b6467a5b13e6d028 lib/tool_shed/util/metadata_util.py --- a/lib/tool_shed/util/metadata_util.py +++ b/lib/tool_shed/util/metadata_util.py @@ -1195,14 +1195,17 @@ repository = suc.get_repository_for_dependency_relationship( app, cleaned_toolshed, name, owner, updated_changeset_revision ) if repository: return repository_dependency_tup, is_valid, error_message - # We'll currently default to setting the repository dependency definition as invalid if an installed repository cannot be found. - # This may not be ideal because the tool shed may have simply been inaccessible when metadata was being generated for the installed - # tool shed repository. - error_message = "Ignoring invalid repository dependency definition for tool shed %s, name %s, owner %s, changeset revision %s "% \ - ( toolshed, name, owner, changeset_revision ) - log.debug( error_message ) - is_valid = False - return repository_dependency_tup, is_valid, error_message + # Don't generate an error message for missing repository dependencies that are required only if compiling the dependent repository's + # tool dependency. + if not only_if_compiling_contained_td: + # We'll currently default to setting the repository dependency definition as invalid if an installed repository cannot be found. + # This may not be ideal because the tool shed may have simply been inaccessible when metadata was being generated for the installed + # tool shed repository. + error_message = "Ignoring invalid repository dependency definition for tool shed %s, name %s, owner %s, changeset revision %s "% \ + ( toolshed, name, owner, changeset_revision ) + log.debug( error_message ) + is_valid = False + return repository_dependency_tup, is_valid, error_message else: # We're in the tool shed. if suc.tool_shed_is_this_tool_shed( toolshed ): 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.
participants (1)
-
commits-noreply@bitbucket.org