Merge pull request #8720 from guerler/remove_dependency_check

Revise toolshed config dependency check error message in repository install manager

lib/tool_shed/galaxy_install/install_manager.py

@@ -722,11 +722,11 @@ def __initiate_and_install_repositories(self, tool_shed_url, repository_revision
         install_repository_dependencies = install_options.get('install_repository_dependencies', False)
         install_resolver_dependencies = install_options.get('install_resolver_dependencies', False)
         install_tool_dependencies = install_options.get('install_tool_dependencies', False)
-        if install_tool_dependencies:
-            self.__assert_can_install_dependencies()
         new_tool_panel_section_label = install_options.get('new_tool_panel_section_label', '')
         tool_panel_section_mapping = install_options.get('tool_panel_section_mapping', {})
         shed_tool_conf = install_options.get('shed_tool_conf', None)
+        if install_tool_dependencies and self.app.tool_dependency_dir is None:
+            raise exceptions.ConfigDoesNotAllowException("Tool dependency installation is disabled in your configuration files.")
         if shed_tool_conf:
             # Get the tool_path setting.
             shed_conf_dict = self.tpm.get_shed_tool_conf_dict(shed_tool_conf)
@@ -992,13 +992,6 @@ def update_tool_shed_repository_status(self, tool_shed_repository, status, error
         self.install_model.context.add(tool_shed_repository)
         self.install_model.context.flush()
 
-    def __assert_can_install_dependencies(self):
-        if self.app.tool_dependency_dir is None:
-            no_tool_dependency_dir_message = "Tool dependencies can be automatically installed only if you set "
-            no_tool_dependency_dir_message += "the value of your 'tool_dependency_dir' setting in your Galaxy "
-            no_tool_dependency_dir_message += "configuration file (galaxy.ini) and restart your Galaxy server.  "
-            raise exceptions.ConfigDoesNotAllowException(no_tool_dependency_dir_message)
-
 
 class RepositoriesInstalledException(exceptions.RequestParameterInvalidException):