3 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py
index 921d5723e..db1ff500e 100644
--- a/src/lib/Bcfg2/Client/Tools/Action.py
+++ b/src/lib/Bcfg2/Client/Tools/Action.py
@@ -1,7 +1,5 @@
 """Action driver"""
 
-import os
-import sys
 import Bcfg2.Client.Tools
 from Bcfg2.Utils import safe_input
 from Bcfg2.Client import matches_white_list, passes_black_list
diff --git a/src/lib/Bcfg2/Client/Tools/DebInit.py b/src/lib/Bcfg2/Client/Tools/DebInit.py
index b544e44d4..0433ac80d 100644
--- a/src/lib/Bcfg2/Client/Tools/DebInit.py
+++ b/src/lib/Bcfg2/Client/Tools/DebInit.py
@@ -3,6 +3,7 @@
 import glob
 import os
 import re
+import Bcfg2.Options
 import Bcfg2.Client.Tools
 
 # Debian squeeze and beyond uses a dependecy based boot sequence
@@ -137,10 +138,10 @@ class DebInit(Bcfg2.Client.Tools.SvcTool):
                 bootcmd = '/usr/sbin/update-rc.d -f %s remove' % \
                           entry.get('name')
             bootcmdrv = self.cmd.run(bootcmd)
-            if self.setup['servicemode'] == 'disabled':
+            if Bcfg2.Options.setup.service_mode == 'disabled':
                 # 'disabled' means we don't attempt to modify running svcs
                 return bootcmdrv and seqcmdrv
-            buildmode = self.setup['servicemode'] == 'build'
+            buildmode = Bcfg2.Options.setup.service_mode == 'build'
             if (entry.get('status') == 'on' and not buildmode) and \
                entry.get('current_status') == 'off':
                 svccmdrv = self.start_service(entry)
diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index 19657f12a..aeafc3817 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -9,6 +9,7 @@ from Bcfg2.Utils import PackedDigitRange
 
 
 def uid_range_type(val):
+    """ Option type to unpack a list of numerical ranges """
     return PackedDigitRange(*Bcfg2.Options.Types.comma_list(val))