Compare commits

..

No commits in common. '5d8d47fd148e4cf5f1c4e45f3377c87f9063569a' and 'cdb59d3260d14bcbda574963242fe9e9815b28cd' have entirely different histories.

@ -642,7 +642,6 @@ class ConfigCLI(CLI):
found = False found = False
config_entries = self._list_entries_from_args() config_entries = self._list_entries_from_args()
plugin_types = config_entries.pop('PLUGINS', None) plugin_types = config_entries.pop('PLUGINS', None)
galaxy_servers = config_entries.pop('GALAXY_SERVERS', None)
if context.CLIARGS['format'] == 'ini': if context.CLIARGS['format'] == 'ini':
if C.CONFIG_FILE is not None: if C.CONFIG_FILE is not None:
@ -659,14 +658,6 @@ class ConfigCLI(CLI):
sections[s].update(plugin_sections[s]) sections[s].update(plugin_sections[s])
else: else:
sections[s] = plugin_sections[s] sections[s] = plugin_sections[s]
if galaxy_servers:
for server in galaxy_servers:
server_sections = _get_ini_entries(galaxy_servers[server])
for s in server_sections:
if s in sections:
sections[s].update(server_sections[s])
else:
sections[s] = server_sections[s]
if sections: if sections:
p = C.config._parsers[C.CONFIG_FILE] p = C.config._parsers[C.CONFIG_FILE]
for s in p.sections(): for s in p.sections():

@ -347,7 +347,6 @@ class ConfigManager(object):
return config_def return config_def
if server_list:
for server_key in server_list: for server_key in server_list:
if not server_key: if not server_key:
# To filter out empty strings or non truthy values as an empty server list env var is equal to ['']. # To filter out empty strings or non truthy values as an empty server list env var is equal to [''].

Loading…
Cancel
Save