summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/sbin/bcfg24
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 24ab67592..d9d4e9e73 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -80,11 +80,11 @@ class Client:
Bcfg2.Logging.setup_logging('bcfg2', to_syslog=False, level=level)
self.logger = logging.getLogger('bcfg2')
self.logger.debug(self.setup)
- if self.setup['drivers'] == 'help':
+ if 'drivers' in self.setup and self.setup['drivers'] == 'help':
self.logger.info("The following drivers are available:")
self.logger.info(Bcfg2.Client.Tools.drivers)
raise SystemExit, 0
- if 'services' in self.setup['remove']:
+ if self.setup['remove'] and 'services' in self.setup['remove']:
self.logger.error("Service removal is nonsensical, disable services to get former behavior")
if self.setup['remove'] not in [False, 'all', 'services', 'packages']:
self.logger.error("Got unknown argument %s for -r" % (self.setup['remove']))