Merge pull request #782 from yarda/priority-inheritance-fix
Priority inheritance fix
This commit is contained in:
commit
3554d5b3b6
2 changed files with 4 additions and 2 deletions
|
|
@ -45,6 +45,8 @@ class Merger(object):
|
|||
profile_a.units[unit_name].type = unit.type
|
||||
profile_a.units[unit_name].enabled = unit.enabled
|
||||
profile_a.units[unit_name].devices = unit.devices
|
||||
if unit.priority is not None:
|
||||
profile_a.units[unit_name].priority = unit.priority
|
||||
if unit.devices_udev_regex is not None:
|
||||
profile_a.units[unit_name].devices_udev_regex = unit.devices_udev_regex
|
||||
if unit.cpuinfo_regex is not None:
|
||||
|
|
|
|||
|
|
@ -89,8 +89,8 @@ class Manager(object):
|
|||
plugin = self._plugins_repository.create(plugin_name)
|
||||
plugins_by_name[plugin_name] = plugin
|
||||
self._plugins.append(plugin)
|
||||
except tuned.plugins.exceptions.NotSupportedPluginException:
|
||||
log.info("skipping plugin '%s', not supported on your system" % plugin_name)
|
||||
except tuned.plugins.exceptions.NotSupportedPluginException as e:
|
||||
log.info("skipping plugin '%s', not supported on your system: %s" % (plugin_name, e))
|
||||
continue
|
||||
except Exception as e:
|
||||
log.error("failed to initialize plugin %s" % plugin_name)
|
||||
|
|
|
|||
Loading…
Reference in a new issue