Merge "Use the misc.ensure_dict helper in conductor engine options saving"

This commit is contained in:
Jenkins
2015-12-15 02:55:45 +00:00
committed by Gerrit Code Review

View File

@@ -46,10 +46,7 @@ class Conductor(object):
self._name = name
self._jobboard = jobboard
self._engine = engine
if not engine_options:
self._engine_options = {}
else:
self._engine_options = engine_options.copy()
self._engine_options = misc.ensure_dict(engine_options)
self._persistence = persistence
self._lock = threading.RLock()
self._notifier = notifier.Notifier()