Created
September 25, 2014 18:59
-
-
Save jmchilton/fd7b70724c6c8c19b311 to your computer and use it in GitHub Desktop.
more tool shed resolver logging
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/galaxy/tools/deps/resolvers/tool_shed_packages.py b/lib/galaxy/tools/deps/resolvers/tool_shed_packages.py | |
index d72b4d6..c54885f 100644 | |
--- a/lib/galaxy/tools/deps/resolvers/tool_shed_packages.py | |
+++ b/lib/galaxy/tools/deps/resolvers/tool_shed_packages.py | |
@@ -3,6 +3,9 @@ from os.path import abspath, join, exists | |
from .galaxy_packages import GalaxyPackageDependencyResolver, GalaxyPackageDependency | |
from ..resolvers import INDETERMINATE_DEPENDENCY | |
+import logging | |
+log = logging.getLogger( __name__ ) | |
+ | |
class ToolShedPackageDependencyResolver(GalaxyPackageDependencyResolver): | |
resolver_type = "tool_shed_packages" | |
@@ -15,8 +18,15 @@ class ToolShedPackageDependencyResolver(GalaxyPackageDependencyResolver): | |
base_path = self.base_path | |
if installed_tool_dependency: | |
path = self._get_package_installed_dependency_path( installed_tool_dependency, base_path, name, version ) | |
- return self._galaxy_package_dep(path, version) | |
+ dep = self._galaxy_package_dep(path, version) | |
+ log.info("Found tool dependency description for requirement %s (%s) - %s" % (name, version, installed_tool_dependency)) | |
+ if dep is not INDETERMINATE_DEPENDENCY: | |
+ log.info("Found Galaxy package for tool shed dependency at path %s" % path) | |
+ else: | |
+ log.info("Could not find Galaxy package for tool shed dependency at path %s" % path) | |
+ return dep | |
else: | |
+ log.info("Failed to find tool dependency description for requirement %s (%s) - %s" % (name, version)) | |
return INDETERMINATE_DEPENDENCY | |
def _find_dep_default( self, name, type='package', **kwds ): | |
@@ -59,7 +69,9 @@ class ToolShedPackageDependencyResolver(GalaxyPackageDependencyResolver): | |
tool_shed_repository.owner, | |
tool_shed_repository.name, | |
tool_shed_repository.installed_changeset_revision ) ) | |
+ log.info("Checking path %s for tool shed dependency environment_settings." % path ) | |
if exists( path ): | |
+ log.info("Found environment settings file.") | |
script = join( path, 'env.sh' ) | |
return GalaxyPackageDependency(script, path, None) | |
return INDETERMINATE_DEPENDENCY |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment