commit c39d923fee581533775e37be3f59f77c021718ee
author Adriana Kobylak <anoo@us.ibm.com> Fri Jul 20 11:31:27 2018 -0500
committer Gunnar Mills <gmills@us.ibm.com> Tue Jul 24 13:52:09 2018 +0000
tree 9b65e110d1d541125620351c7cd623473e66b3d8
parent 0bd65051a02ead4e7bc1401d1eee3ba084ffd775

deleteAll: Delete functional version if chassis off

The deleteAll function was skipping to delete the functional
version, which should be allowed if the chassis state is not on.
The erase function already supports that so the user can
individually delete the functional version, just the delete
would not work via the DeleteAll call.

Tested: All PNOR versions, including the functional one, get
deleted at chassis power off via the DeleteAll method.

Change-Id: Ib390545f3ade68e2a3182064549e05994e7f7191
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

item_updater.cpp

diff --git a/item_updater.cpp b/item_updater.cpp
index 76c437c..8ae8549 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -493,9 +493,15 @@
 
 void ItemUpdater::deleteAll()
 {
+    auto chassisOn = isChassisOn();
+
     for (const auto& activationIt : activations)
     {
-        if (!isVersionFunctional(activationIt.first))
+        if (isVersionFunctional(activationIt.first) && chassisOn)
+        {
+            continue;
+        }
+        else
         {
             ItemUpdater::erase(activationIt.first);
         }