commit 6d62ceb307409a3b5f1b0012558108bfbfa4300c
author Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:47:19 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:47:35 2021 -0500
tree 71b139b7d58d5b98d345cd324c409ac0a3a0f120
parent 7905f587ac6aace27e7238a815b7cf5c1025c6ea

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: I3f173e46d23ab9a21f37356df848f5226ccf7962

src/activation.cpp

diff --git a/src/activation.cpp b/src/activation.cpp
index 13b42cc..8ea4f25 100644
--- a/src/activation.cpp
+++ b/src/activation.cpp
@@ -24,7 +24,6 @@
 namespace softwareServer = sdbusplus::xyz::openbmc_project::Software::server;
 
 using namespace phosphor::logging;
-using sdbusplus::exception::SdBusError;
 using SoftwareActivation = softwareServer::Activation;
 
 auto Activation::activation(Activations value) -> Activations
@@ -96,7 +95,7 @@
         bus.call_noreply(method);
         return true;
     }
-    catch (const SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>("Error staring service", entry("ERROR=%s", e.what()));
         onUpdateFailed();
@@ -265,7 +264,7 @@
     {
         bus.call(method);
     }
-    catch (const SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>("Error performing call to Delete object path",
                         entry("ERROR=%s", e.what()),

src/utils.cpp

diff --git a/src/utils.cpp b/src/utils.cpp
index 949a1e1..5889b6b 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -113,7 +113,7 @@
         }
         return ret;
     }
-    catch (const sdbusplus::exception::SdBusError& ex)
+    catch (const sdbusplus::exception::exception& ex)
     {
         log<level::ERR>("GetObject call failed", entry("PATH=%s", path),
                         entry("INTERFACE=%s", interface));
@@ -192,7 +192,7 @@
         reply.read(value);
         return any(value);
     }
-    catch (const sdbusplus::exception::SdBusError& ex)
+    catch (const sdbusplus::exception::exception& ex)
     {
         log<level::ERR>("GetProperty call failed", entry("PATH=%s", path),
                         entry("INTERFACE=%s", interface),