nikon/tuned
1
0
Fork 0
Code Activity Actions

Merge pull request #77 from olysonek/variables

Browse source 
Expand variables in the 'devices' option
This commit is contained in:
Jaroslav Škarvada 2017-10-18 00:17:22 +02:00 committed by GitHub
commit c3e18790ec
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tuned/profiles/loader.py
View file

@ -60,8 +60,14 @@ class Loader(object):
if "variables" in final_profile.units:
self._variables.add_from_cfg(final_profile.units["variables"].options)
del(final_profile.units["variables"])
# FIXME hack, do all variable expansions in one place
self._expand_vars_in_devices(final_profile)
return final_profile
def _expand_vars_in_devices(self, profile):
for unit in profile.units:
profile.units[unit].devices = self._variables.expand(profile.units[unit].devices)
def _load_profile(self, profile_names, profiles, processed_files):
for name in profile_names:
filename = self._profile_locator.get_config(name, processed_files)