Restore changes to tool shed package resolver.

galaxyproject · Oct 30, 2015 · 45e3257 · 45e3257
1 parent aefc35a
commit 45e3257
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/galaxy/tools/deps/resolvers/tool_shed_packages.py b/lib/galaxy/tools/deps/resolvers/tool_shed_packages.py
@@ -24,7 +24,9 @@ def _find_dep_default( self, name, type='package', **kwds ):
             installed_tool_dependency = self._get_installed_dependency( name, type, version=None, **kwds )
             if installed_tool_dependency:
                 dependency = self._get_set_environment_installed_dependency_script_path( installed_tool_dependency, name )
-                if dependency.script and dependency.path:
+                is_galaxy_dep = isinstance(dependency, GalaxyPackageDependency)
+                has_script_dep = is_galaxy_dep and dependency.script and dependency.path
+                if has_script_dep:
                     # Environment settings do not use versions.
                     return GalaxyPackageDependency(dependency.script, dependency.path, None)
         return INDETERMINATE_DEPENDENCY