Skip to content

Commit

Permalink
Update lib/galaxy/config/__init__.py
Browse files Browse the repository at this point in the history
Co-authored-by: Nicola Soranzo <[email protected]>
  • Loading branch information
natefoo and nsoranzo authored Oct 28, 2024
1 parent d622d2d commit 17e228f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/galaxy/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -982,8 +982,8 @@ def _process_config(self, kwargs: Dict[str, Any]) -> None:
# self, populate config_dict
self.config_dict["conda_mapping_files"] = [self.local_conda_mapping_file, _default_mapping]

if not running_from_source and kwargs.get("conda_auto_init") is None:
self.config_dict["conda_auto_init"] = False
if kwargs.get("conda_auto_init") is None:
self.config_dict["conda_auto_init"] = running_from_source

if self.container_resolvers_config_file:
self.container_resolvers_config_file = self._in_config_dir(self.container_resolvers_config_file)
Expand Down

0 comments on commit 17e228f

Please sign in to comment.