diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-09-01 11:03:38 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-09-01 11:03:38 -0500 |
| commit | cc9237d2be14c96201ea2410cfac21ec34caf8e6 (patch) | |
| tree | f74d7a973098e4b8076fa65469c5b6474e6583f6 /src/lib/Bcfg2/Client/Tools/__init__.py | |
| parent | f6a142aed6756449974ab38bacf98d47e29dda3e (diff) | |
| parent | 8a36d9dccc6c4aed460763fb20083877c77a34cd (diff) | |
| download | bcfg2-cc9237d2be14c96201ea2410cfac21ec34caf8e6.tar.gz bcfg2-cc9237d2be14c96201ea2410cfac21ec34caf8e6.tar.bz2 bcfg2-cc9237d2be14c96201ea2410cfac21ec34caf8e6.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Server/BuiltinCore.py
src/lib/Bcfg2/Server/Plugins/Metadata.py
src/lib/Bcfg2/Server/Plugins/NagiosGen.py
src/lib/Bcfg2/Server/Plugins/Probes.py
src/lib/Bcfg2/Server/SSLServer.py
tools/README
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 aab2459f2..4a808aa60 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -590,14 +590,15 @@ 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 Bcfg2.Options.setup.interactive)): continue success = False - if entry.get('status') == 'on': + if estatus == 'on': if Bcfg2.Options.setup.service_mode == 'build': success = self.stop_service(entry) elif entry.get('name') not in self.restarted: |