diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-24 04:41:56 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-06 04:52:35 +0100 |
commit | a3469cba7aa2911e05dc2d0b98b2e56e73c10415 (patch) | |
tree | e9c2c14a51d728ad9afed8e3205ffab394f0844d | |
parent | 56f89e7ed1b64e424e8d8e65695549e14b40a2f3 (diff) | |
download | bcfg2-a3469cba7aa2911e05dc2d0b98b2e56e73c10415.tar.gz bcfg2-a3469cba7aa2911e05dc2d0b98b2e56e73c10415.tar.bz2 bcfg2-a3469cba7aa2911e05dc2d0b98b2e56e73c10415.zip |
Client: always actions do not modify hosts
Actions that are executed always, does not set the host statistics
to modified. (One always action would lead to always modified hosts)
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | src/lib/Client/Frame.py | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8863987a8..d06347378 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcfg2 (1.2.3-4) unstable; urgency=low + + * Client: always actions do not modify hosts + + -- Alexander Sulfrian <alex@spline.inf.fu-berlin.de> Thu, 24 Jan 2013 04:42:06 +0100 + bcfg2 (1.2.3-3) unstable; urgency=low * Client: allow pre-Actions and important-Paths to enable installs diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py index 5826b36e8..78b1dd1d9 100644 --- a/src/lib/Client/Frame.py +++ b/src/lib/Client/Frame.py @@ -445,7 +445,8 @@ class Frame: stats.set('state', 'dirty') # List bad elements of the configuration - for (data, ename) in [(self.modified, 'Modified'), (self.extra, "Extra"), \ + mods = [m for m in self.modified if m.tag != 'Action' or m.get('when') != 'always'] + for (data, ename) in [(mods, 'Modified'), (self.extra, "Extra"), \ ([entry for entry in self.states if not \ self.states[entry]], "Bad")]: container = Bcfg2.Client.XML.SubElement(stats, ename) |