Add inventory recheck functionality to -k mode (Deals with part 3 of Ticket #280)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2538 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 10 insertions, 1 deletions

diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py
index 2380ed4a1..c5eec7be4 100644
--- a/src/lib/Client/Frame.py
+++ b/src/lib/Client/Frame.py
@@ -179,7 +179,13 @@ class Frame:
 
         if ((self.states.values().count(False) == 0) and not self.extra):
             self.logger.info('All entries correct.')
-    
+
+    def ReInventory(self):
+        '''Recheck everything'''
+        if not self.setup['dryrun'] and self.setup['kevlar']:
+            self.logger.info("Rechecking system inventory")
+            self.Inventory()
+
     def Execute(self):
         '''Run all methods'''
         self.Inventory()
@@ -189,6 +195,9 @@ class Frame:
         self.Install()
         self.times['install'] = time.time()
         self.Remove()
+        self.times['remove'] = time.time()
+        self.ReInventory()
+        self.times['reinventory'] = time.time()
         self.times['finished'] = time.time()
         self.CondDisplayState('final')