commit 0fd4dde03735c7fbb2dd4122a92ed39216a3f3f7
author Vikram Bodireddy <vikram.bodireddy@intel.com> Fri Dec 06 15:48:00 2019 +0530
committer Jason M. Bills <jason.m.bills@linux.intel.com> Wed Apr 08 13:12:31 2020 -0700
tree d5005e1d66a585320e60769124c96d4091a2d614
parent 3c6c8c3433be65c2df4c4a646a500cbc13e7461e

PFR Manager minor fix for conditional statetment

PFR Manager minor fix for a line that uses lengthy conditinal
check, instead we use if-else conditional.

Change-Id: I03b2b08e6acb86d933aa952a81f51006cddd2355
Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>

service/src/pfr_mgr.cpp

diff --git a/service/src/pfr_mgr.cpp b/service/src/pfr_mgr.cpp
index ed97fd2..b773916 100644
--- a/service/src/pfr_mgr.cpp
+++ b/service/src/pfr_mgr.cpp
@@ -59,12 +59,20 @@
      * xyz.openbmc_project.Software.Version. since these versions are already
      * active, so we should set "activation" to Active and
      * "RequestedActivation" to None. */
-    std::string activation =
-        (imgType == ImageType::bmcRecovery ||
-         imgType == ImageType::biosRecovery ||
-         imgType == ImageType::cpldRecovery)
-            ? "xyz.openbmc_project.Software.Activation.Activations.StandbySpare"
-            : "xyz.openbmc_project.Software.Activation.Activations.Active";
+    std::string activation;
+    if (imgType == ImageType::bmcRecovery ||
+        imgType == ImageType::biosRecovery ||
+        imgType == ImageType::cpldRecovery)
+    {
+        activation =
+            "xyz.openbmc_project.Software.Activation.Activations.StandbySpare";
+    }
+    else
+    {
+        activation =
+            "xyz.openbmc_project.Software.Activation.Activations.Active";
+    }
+
     std::string reqActNone =
         "xyz.openbmc_project.Software.Activation.RequestedActivations.None";
     auto activationIface = server.add_interface(