Unverified Commit 0a90de3d authored by mvdbeek's avatar mvdbeek
Browse files

Pass config_file explicitly

parent 7fc1ba06

lib/galaxy/config/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ class BaseAppConfiguration(HasDynamicProperties): 


    def _set_config_base(self, config_kwargs):

        def _set_global_conf():

            self.config_file = config_kwargs.get("__file__", None)

            self.config_file = config_kwargs.get("__file__") or config_kwargs.get("config_file")

            self.global_conf = config_kwargs.get("global_conf")

            self.global_conf_parser = configparser.ConfigParser()

            if not self.config_file and self.global_conf and "__file__" in self.global_conf:

lib/galaxy/dependencies/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class ConditionalDependencies: 
            self.config = load_app_properties(config_file=self.config_file)

        else:

            self.config = config

        self.config_object = GalaxyAppConfiguration(**self.config)

        self.config_object = GalaxyAppConfiguration(config_file=self.config_file, **self.config)

        self.parse_configs()

        self.get_conditional_requirements()