diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-08-12 10:56:05 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-08-12 10:56:05 -0500 |
| commit | 924457a917eba6b04c57dbc1fa003dbcb60daca5 (patch) | |
| tree | 83d88acf6b67655af6abcff5c4ce85499df5c340 /src/lib/Bcfg2/Client/Tools/__init__.py | |
| parent | 8b1fa7e4868cd75fd541ca4a2295923f185d953d (diff) | |
| download | bcfg2-924457a917eba6b04c57dbc1fa003dbcb60daca5.tar.gz bcfg2-924457a917eba6b04c57dbc1fa003dbcb60daca5.tar.bz2 bcfg2-924457a917eba6b04c57dbc1fa003dbcb60daca5.zip | |
Client: Don't modify running services if ignored
Previously, when a bundle's contents were updated, all services listed
in the bundle were stopped if the status attribute was set to 'ignore'.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index 11fe55bd6..703b8ff57 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -594,13 +594,14 @@ class SvcTool(Tool): if not self.handlesEntry(entry): continue + estatus = entry.get('status') restart = entry.get("restart", "true").lower() - if (restart == "false" or + if (restart == "false" or estatus == 'ignore' or (restart == "interactive" and not self.setup['interactive'])): continue success = False - if entry.get('status') == 'on': + if estatus == 'on': if self.setup['servicemode'] == 'build': success = self.stop_service(entry) elif entry.get('name') not in self.restarted: |