commit c7cc45e4ac9ca1f4693dfc93e4ff203992d446a1
author Alex Vakulenko <avakulenko@google.com> Thu Jan 07 10:46:26 2016 -0800
committer Alex Vakulenko <avakulenko@google.com> Fri Jan 08 13:51:15 2016 -0800
tree ab488afa53ac01471b3d07287dcffc35142dea06
parent 210591e9a4f9628eeb3432f5d6cdb759755273e2

update_engine: Use helper Command::AbortWithCustomError() method

weaved now provides new variants of Command::Abort() that allow
to specify the error information as brillo::Error or binder::Status.

Command::AbortWithCustomError(brillo::Error*) also makes sure the error
code is prepended with "_", so no need to add that in OnTrackChannel().

BUG: 25875613
Change-Id: Ic9b2cb6f6ef092b85883ebb5bf5e4c936aa770f0

update_attempter.cc

diff --git a/update_attempter.cc b/update_attempter.cc
index bc06502..dd7c1be 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -1098,7 +1098,7 @@
     brillo::Error::AddTo(error,
                          FROM_HERE,
                          brillo::errors::dbus::kDomain,
-                         "_set_target_error",
+                         "set_target_error",
                          error_message);
     return false;
   }

weave_service.cc

diff --git a/weave_service.cc b/weave_service.cc
index 414234c..c6a67f2 100644
--- a/weave_service.cc
+++ b/weave_service.cc
@@ -101,7 +101,7 @@
 void WeaveService::OnCheckForUpdates(std::unique_ptr<weaved::Command> command) {
   brillo::ErrorPtr error;
   if (!delegate_->OnCheckForUpdates(&error)) {
-    command->Abort(error->GetCode(), error->GetMessage(), nullptr);
+    command->AbortWithCustomError(error.get(), nullptr);
     return;
   }
   command->Complete({}, nullptr);
@@ -111,7 +111,7 @@
   string channel = command->GetParameter<string>("channel");
   brillo::ErrorPtr error;
   if (!delegate_->OnTrackChannel(channel, &error)) {
-    command->Abort(error->GetCode(), error->GetMessage(), nullptr);
+    command->AbortWithCustomError(error.get(), nullptr);
     return;
   }
   command->Complete({}, nullptr);