diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-03 10:35:57 -0700 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-03 10:35:57 -0700 |
| commit | 0f7b300fe182c48c7e4c36e43a1f439fcde8fb54 (patch) | |
| tree | e063a1da96ca443c9264b23db1573318b8259b56 /src | |
| parent | 166201ecf2cd7c5837bdeb5ec4fcaef0132ed719 (diff) | |
| parent | 730179b581e0dcdaa93a4819acbeb207db6980ef (diff) | |
| download | bcfg2-0f7b300fe182c48c7e4c36e43a1f439fcde8fb54.tar.gz bcfg2-0f7b300fe182c48c7e4c36e43a1f439fcde8fb54.tar.bz2 bcfg2-0f7b300fe182c48c7e4c36e43a1f439fcde8fb54.zip | |
Merge pull request #139 from kincl/pre-action-processing-with-independent-entries
Pre action processing with independent entries
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Frame.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py index 1b26450a6..ad718749e 100644 --- a/src/lib/Bcfg2/Client/Frame.py +++ b/src/lib/Bcfg2/Client/Frame.py @@ -329,11 +329,13 @@ class Frame(object): if bundle.tag != 'Bundle': continue bmodified = len([item for item in bundle - if item in self.whitelist]) + if item in self.whitelist or + item in self.modified]) actions = [a for a in bundle.findall('./Action') if (a.get('timing') != 'post' and (bmodified or a.get('when') == 'always'))] - # now we process all "always actions" + # now we process all "pre" and "both" actions that are either + # always or the bundle has been modified if self.setup['interactive']: self.promptFilter(iprompt, actions) self.DispatchInstallCalls(actions) |