diff --git a/lib/galaxy/tools/deps/container_resolvers/__init__.py b/lib/galaxy/tools/deps/container_resolvers/__init__.py index 9b8ad92484a..0e819f9458a 100644 --- a/lib/galaxy/tools/deps/container_resolvers/__init__.py +++ b/lib/galaxy/tools/deps/container_resolvers/__init__.py @@ -23,15 +23,12 @@ class ContainerResolver(Dictifiable): self.app_info = app_info self.resolver_kwds = kwds - def _get_config_option(self, key, default=None, config_prefix=None, **kwds): + def _get_config_option(self, key, default=None): """Look in resolver-specific settings for option and then fallback to global settings. """ - global_key = "%s_%s" % (config_prefix, key) - if key in kwds: - return kwds.get(key) - elif self.app_info and hasattr(self.app_info, global_key): - return getattr(self.app_info, global_key) + if self.app_info and hasattr(self.app_info, key): + return getattr(self.app_info, key) else: return default diff --git a/lib/galaxy/tools/deps/container_resolvers/mulled.py b/lib/galaxy/tools/deps/container_resolvers/mulled.py index 64a48b8673c..fc53d5cf7a8 100644 --- a/lib/galaxy/tools/deps/container_resolvers/mulled.py +++ b/lib/galaxy/tools/deps/container_resolvers/mulled.py @@ -351,11 +351,11 @@ class BuildMulledDockerContainerResolver(ContainerResolver): self.hash_func = hash_func self._mulled_kwds = { 'namespace': namespace, - 'channels': self._get_config_option("channels", DEFAULT_CHANNELS, prefix="mulled"), + 'channels': self._get_config_option("mulled_channels", DEFAULT_CHANNELS), 'hash_func': self.hash_func, 'command': 'build-and-test', } - self.auto_init = self._get_config_option("auto_init", DEFAULT_CHANNELS, prefix="involucro") + self.auto_init = self._get_config_option("involucro_auto_init", True) def resolve(self, enabled_container_types, tool_info): if tool_info.requires_galaxy_python_environment: @@ -396,13 +396,13 @@ class BuildMulledSingularityContainerResolver(ContainerResolver): self.cache_directory = kwds.get("cache_directory", os.path.join(app_info.container_image_cache_path, "singularity", "mulled")) self.hash_func = hash_func self._mulled_kwds = { - 'channels': self._get_config_option("channels", DEFAULT_CHANNELS, prefix="mulled"), + 'channels': self._get_config_option("mulled_channels", DEFAULT_CHANNELS), 'hash_func': self.hash_func, 'command': 'build-and-test', 'singularity': True, 'singularity_image_dir': self.cache_directory, } - self.auto_init = self._get_config_option("auto_init", DEFAULT_CHANNELS, prefix="involucro") + self.auto_init = self._get_config_option("involucro_auto_init", True) def resolve(self, enabled_container_types, tool_info): if tool_info.requires_galaxy_python_environment: