summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Tools/POSIX.py5
-rw-r--r--src/lib/Options.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py
index 917dc6620..8127d29fe 100644
--- a/src/lib/Client/Tools/POSIX.py
+++ b/src/lib/Client/Tools/POSIX.py
@@ -611,8 +611,9 @@ class POSIX(Bcfg2.Client.Tools.Tool):
return False
# If we get here, then the parent directory should exist
- if entry.get("paranoid", False) and self.setup.get("paranoid", False) \
- and not (entry.get('current_exists', 'true') == 'false'):
+ if (entry.get("paranoid", False) == 'true') and \
+ self.setup.get("paranoid", False) and not \
+ (entry.get('current_exists', 'true') == 'false'):
bkupnam = entry.get('name').replace('/', '_')
# current list of backups for this ConfigFile
bkuplist = [f for f in os.listdir(self.ppath) if
diff --git a/src/lib/Options.py b/src/lib/Options.py
index 1e4ce7aef..a983e8827 100644
--- a/src/lib/Options.py
+++ b/src/lib/Options.py
@@ -253,7 +253,7 @@ CLIENT_DRYRUN = Option('do not actually change the system',
CLIENT_EXTRA_DISPLAY = Option('enable extra entry output',
default=False, cmd='-e', )
CLIENT_PARANOID = Option('make automatic backups of config files',
- default=False, cmd='-P', )
+ default=False, cmd='-P', cf=('client', 'paranoid'))
CORE_PROFILE = Option('profile',
default=False, cmd='-p', )
CLIENT_DRIVERS = Option('Specify tool driver set', cmd='-D',