valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

loader: rename vars to avoid shadowing grains() func

Browse Source
This commit is contained in:
Chris Rebert 2013-05-20 12:05:10 -07:00
parent ee113486b5
commit 647a732b50
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/loader.py
View File

@ -252,9 +252,9 @@ def grains(opts):
opts['grains'] = {}
load = _create_loader(opts, 'grains', 'grain', ext_dirs=False)
grains = load.gen_grains()
grains.update(opts['grains'])
return grains
grains_info = load.gen_grains()
grains_info.update(opts['grains'])
return grains_info
def call(fun, **kwargs):
@ -846,7 +846,7 @@ class Loader(object):
members. Then verify that the returns are python dict's and return
a dict containing all of the returned values.
'''
grains = {}
grains_data = {}
funcs = self.gen_functions()
for key, fun in funcs.items():
if key[key.index('.') + 1:] != 'core':
@ -854,7 +854,7 @@ class Loader(object):
ret = fun()
if not isinstance(ret, dict):
continue
grains.update(ret)
grains_data.update(ret)
for key, fun in funcs.items():
if key[key.index('.') + 1:] == 'core':
continue
@ -871,5 +871,5 @@ class Loader(object):
continue
if not isinstance(ret, dict):
continue
grains.update(ret)
return grains
grains_data.update(ret)
return grains_data