diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-08-10 13:11:25 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-08-10 13:13:50 -0500 |
| commit | 8059a36335f4bc4baedfd7a6e0b434779e89fe84 (patch) | |
| tree | 06823f09853a503b367c1dfaf94e397b0650fd74 /src | |
| parent | 7e61299d042c296ad1bbfd189b0457353ed84678 (diff) | |
| download | bcfg2-8059a36335f4bc4baedfd7a6e0b434779e89fe84.tar.gz bcfg2-8059a36335f4bc4baedfd7a6e0b434779e89fe84.tar.bz2 bcfg2-8059a36335f4bc4baedfd7a6e0b434779e89fe84.zip | |
Action: Fix whitelist mode (Resolves #1029)
Don't run 'post' Action entries if they are unlisted in whitelist mode.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Client/Tools/Action.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/Action.py b/src/lib/Client/Tools/Action.py index bc57a0e27..4e85e3a72 100644 --- a/src/lib/Client/Tools/Action.py +++ b/src/lib/Client/Tools/Action.py @@ -85,4 +85,8 @@ class Action(Bcfg2.Client.Tools.Tool): for action in bundle.findall("Action"): if action.get('timing') in ['post', 'both'] and \ action.get('when') != 'modified': - states[action] = self.RunAction(action) + if self.setup['decision'] == 'whitelist': + if action in self.setup['decision_list']: + states[action] = self.RunAction(action) + else: + states[action] = self.RunAction(action) |