diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2013-08-30 14:35:32 -0400 |
|---|---|---|
| committer | Jason Kincl <kincljc@ornl.gov> | 2013-08-30 14:35:32 -0400 |
| commit | 59043506d4ee71e39e89fc3216c2bb5cde92604e (patch) | |
| tree | b1aa8a39e2aa8cad389f4b2f01f32baf99b2dd57 /src | |
| parent | 3c38f4fab6a0128f8a0da5155f8bcb382fbd5b8a (diff) | |
| download | bcfg2-59043506d4ee71e39e89fc3216c2bb5cde92604e.tar.gz bcfg2-59043506d4ee71e39e89fc3216c2bb5cde92604e.tar.bz2 bcfg2-59043506d4ee71e39e89fc3216c2bb5cde92604e.zip | |
Client: Add entries processed as important to list of entries when
determining if a bundle has been modified
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..2eb41e837 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) |