commit 7b5685d1053326df9ecb20ab7246c97114dee774
author Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:32:14 2021 -0500
committer Gunnar Mills <gmills@us.ibm.com> Tue Sep 07 20:30:12 2021 +0000
tree c6026a6a1d991cadde4054a9181aa8752842b13b
parent 0313b993d9c7d23a20760dba6cc5607092d2903d

exception: switch to public sdbus exception

SdBusError was intended to be a private error type inside sdbusplus.
Switch all catch locations to use the general sdbusplus::exception type.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: If9ecc60e370b7ab62e58dc1c3bfdd4051ee9c435

activation.cpp

diff --git a/activation.cpp b/activation.cpp
index 8765181..0ab5eb5 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -27,7 +27,6 @@
 namespace softwareServer = sdbusplus::xyz::openbmc_project::Software::server;
 
 using namespace phosphor::logging;
-using sdbusplus::exception::SdBusError;
 using InternalFailure =
     sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
 
@@ -48,7 +47,7 @@
     {
         this->bus.call_noreply(method);
     }
-    catch (const SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         if (e.name() != nullptr &&
             strcmp("org.freedesktop.systemd1.AlreadySubscribed", e.name()) == 0)
@@ -118,7 +117,7 @@
             return;
         }
     }
-    catch (const SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>("Error in Get Delete Object",
                         entry("VERSIONPATH=%s", path.c_str()));
@@ -148,7 +147,7 @@
     {
         bus.call(method);
     }
-    catch (const SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         if (e.name() != nullptr && strcmp("System.Error.ELOOP", e.name()) == 0)
         {
@@ -193,7 +192,7 @@
                 return true;
             }
         }
-        catch (const SdBusError& e)
+        catch (const sdbusplus::exception::exception& e)
         {
             log<level::ERR>("Error in getting ApplyTime",
                             entry("ERROR=%s", e.what()));
@@ -221,7 +220,7 @@
     {
         auto reply = bus.call(method);
     }
-    catch (const SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ALERT>("Error in trying to reboot the Host. "
                           "The Host needs to be manually rebooted to complete "
@@ -287,7 +286,7 @@
         reply.read(fieldMode);
         return std::get<bool>(fieldMode);
     }
-    catch (const SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>("Error in fieldModeEnabled getValue");
         elog<InternalFailure>();