summaryrefslogtreecommitdiff
path: root/init/action.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-05-28 03:12:05 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-05-28 03:12:05 +0000
commit6220136528a29e96838bf6e18ea81dad9995cecc (patch)
tree62d78b6f2b3873de7c078a44a0f7b294e68cdd7e /init/action.cpp
parent8c2ad73742ead5dd9cec3ac78be9ca002ca8ee38 (diff)
parent0e68ab18fbef221e1a18fbf63babfd5d17bf3b2c (diff)
Snap for 5608795 from 0e68ab18fbef221e1a18fbf63babfd5d17bf3b2c to rvc-release
Change-Id: I43f1c8b8baeaab87a6a5eb0d4821df44124bb622
Diffstat (limited to 'init/action.cpp')
-rw-r--r--init/action.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/action.cpp b/init/action.cpp
index 94ccef2aa..a4f69367c 100644
--- a/init/action.cpp
+++ b/init/action.cpp
@@ -127,7 +127,7 @@ void Action::ExecuteCommand(const Command& command) const {
// report such failures unless we're running at the DEBUG log level.
bool report_failure = !result.has_value();
if (report_failure && android::base::GetMinimumLogSeverity() > android::base::DEBUG &&
- result.error_errno() == ENOENT) {
+ result.error().as_errno == ENOENT) {
report_failure = false;
}
@@ -139,7 +139,7 @@ void Action::ExecuteCommand(const Command& command) const {
LOG(INFO) << "Command '" << cmd_str << "' action=" << trigger_name << " (" << filename_
<< ":" << command.line() << ") took " << duration.count() << "ms and "
- << (result ? "succeeded" : "failed: " + result.error_string());
+ << (result ? "succeeded" : "failed: " + result.error().as_string);
}
}