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

Merge pull request #1106 from jhutchins/develop

Browse Source 
Prevent use and use_in from adding requiresite args
This commit is contained in:
Thomas S Hatch 2012-04-19 19:12:07 -07:00
commit 87f43de128
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/state.py
View File

@ -662,6 +662,7 @@ class State(object):
Extend the data reference with requisite_in arguments Extend the data reference with requisite_in arguments
''' '''
req_in = set(['require_in', 'watch_in', 'use', 'use_in']) req_in = set(['require_in', 'watch_in', 'use', 'use_in'])
req_in_all = req_in.union(set(['require', 'watch']))
extend = {} extend = {}
for id_, body in high.items(): for id_, body in high.items():
for state, run in body.items(): for state, run in body.items():
@ -726,12 +727,13 @@ class State(object):
extend[ext_id] = {} extend[ext_id] = {}
if not _state in extend[ext_id]: if not _state in extend[ext_id]:
extend[ext_id][_state] = [] extend[ext_id][_state] = []
ignore_args = req_in_all.union(ext_args)
for arg in high[id_][state]: for arg in high[id_][state]:
if not isinstance(arg, dict): if not isinstance(arg, dict):
continue continue
if len(arg) != 1: if len(arg) != 1:
continue continue
if arg.keys()[0] in ext_args: if arg.keys()[0] in ignore_args:
continue continue
extend[ext_id][_state].append(arg) extend[ext_id][_state].append(arg)
continue continue
@ -746,12 +748,13 @@ class State(object):
extend[id_] = {} extend[id_] = {}
if not state in extend[id_]: if not state in extend[id_]:
extend[id_][state] = [] extend[id_][state] = []
ignore_args = req_in_all.union(loc_args)
for arg in high[ext_id][_state]: for arg in high[ext_id][_state]:
if not isinstance(arg, dict): if not isinstance(arg, dict):
continue continue
if len(arg) != 1: if len(arg) != 1:
continue continue
if arg.keys()[0] in loc_args: if arg.keys()[0] in ignore_args:
continue continue
extend[id_][state].append(arg) extend[id_][state].append(arg)
continue continue