commit ce82de51f0f61fade0177e1de25c4331f96a7a75
author Adriana Kobylak <anoo@us.ibm.com> Tue Jan 16 13:56:38 2024 -0600
committer Adriana Kobylak <anoo@us.ibm.com> Tue Jan 16 14:38:02 2024 -0600
tree a679c9cc29134047da5a37617288b31211743224
parent 1db5847d50fc8ea394d1aed19e10995500b09bd1

errors: Use non-deprecated namespaces

The error namespaces have been updated. Reference:
https://gerrit.openbmc.org/c/openbmc/sdbusplus/+/66308
https://gerrit.openbmc.org/c/openbmc/phosphor-logging/+/66463

Tested: Compiled with the SDBUSPP_REMOVE_DEPRECATED_NAMESPACE option.

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

activation.cpp

diff --git a/activation.cpp b/activation.cpp
index b5fe199..8f4c4c0 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -32,7 +32,7 @@
 PHOSPHOR_LOG2_USING;
 using namespace phosphor::logging;
 using InternalFailure =
-    sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
+    sdbusplus::error::xyz::openbmc_project::common::InternalFailure;
 
 #ifdef WANT_SIGNATURE_VERIFY
 namespace control = sdbusplus::server::xyz::openbmc_project::control;
@@ -94,8 +94,8 @@
         fs::path uploadDir(IMG_UPLOAD_DIR);
         if (!verifySignature(uploadDir / versionId, SIGNED_IMAGE_CONF_PATH))
         {
-            using InvalidSignatureErr = sdbusplus::xyz::openbmc_project::
-                Software::Version::Error::InvalidSignature;
+            using InvalidSignatureErr = sdbusplus::error::xyz::openbmc_project::
+                software::version::InvalidSignature;
             report<InvalidSignatureErr>();
             // Stop the activation process, if fieldMode is enabled.
             if (parent.control::FieldMode::fieldModeEnabled())