From 193fea0a6005cdf6d0bebb2c4956d5fd01f9cb49 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Fri, 7 Jun 2013 01:32:34 +0200 Subject: 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. --- debian/changelog | 3 ++- src/lib/Client/Tools/POSIX.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index aa6c5f5fb..a38c40258 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ bcfg2 (1.2.3-14) unstable; urgency=low * Client/Tools/POSIX: fix indentation + * Client/Tools/POSIX: fix prune actions - -- Alexander Sulfrian Fri, 07 Jun 2013 01:27:24 +0200 + -- Alexander Sulfrian Fri, 07 Jun 2013 01:31:15 +0200 bcfg2 (1.2.3-13) unstable; urgency=low diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index 847116286..5f380023b 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -319,6 +319,8 @@ class POSIX(Bcfg2.Client.Tools.Tool): [entry.append(XML.Element('Prune', path=x)) \ for x in ex_ents] self.prune_list += ex_ents + elif self.prune_list: + pruneTrue = False except OSError: ex_ents = [] pruneTrue = True -- cgit v1.2.3-1-g7c22