Merge "Fix merge_configs.py file when not provide vars parameter"

This commit is contained in:
Jenkins 2016-09-26 10:51:27 +00:00 committed by Gerrit Code Review
commit f3595f2317

View File

@ -80,8 +80,8 @@ class ActionModule(action.ActionBase):
fakefile.close()
new_module_args = self._task.args.copy()
del new_module_args['vars']
del new_module_args['sources']
new_module_args.pop('vars', None)
new_module_args.pop('sources', None)
new_module_args.update(
dict(