summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2013-06-07 01:32:34 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2013-11-22 11:53:33 +0100
commit79b7ed20c02546a09307afeb5454a7100afdf7f2 (patch)
tree779bb3ef2dadacbc5b5ae51b494facb8d0ddc2af
parent7ce80b590e152a709af55528602f761d818a81c9 (diff)
downloadbcfg2-79b7ed20c02546a09307afeb5454a7100afdf7f2.tar.gz
bcfg2-79b7ed20c02546a09307afeb5454a7100afdf7f2.tar.bz2
bcfg2-79b7ed20c02546a09307afeb5454a7100afdf7f2.zip
Client/Tools/POSIX: fix prune actions
The prune actions was not run. The fix that does not add multiple prune actions on multiple Verify runs in 7077358b1 does not set the pruneTrue flag during the later Verify runs and therefor the prune actions are ignored. This set the pruneTrue flag if the first Verify run, detected some entries that should be pruned.
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/Directory.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py b/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
index ceb360d7e..c714a8a6b 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/Directory.py
@@ -44,6 +44,8 @@ class POSIXDirectory(POSIXTool):
for extra in extras:
Bcfg2.Client.XML.SubElement(entry, 'Prune', name=extra)
self.prune_list += extras
+ elif self.prune_list:
+ prune = False
except OSError:
prune = True