commit c5cf85db23ac8c8a0206e911d73ef1c42ad66ed6
author Tom Cherry <tomcherry@google.com> Wed Jul 31 13:59:15 2019 -0700
committer Tom Cherry <tomcherry@google.com> Thu Aug 01 10:34:58 2019 -0700
tree 5e940c776939c3d175bf50cbbd1ea92d5840d39a
parent 244d9b8fb968b9f0289ac69d723a4f760d1c1b91

init: don't log in expand_props directly

It's better to pass the error message to the caller to determine how
best to print the error.

Test: build
Change-Id: Id8857c459df2f26c031650166609608d20e4d051

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 3761750..3819042 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -648,13 +648,14 @@
             }
 
             std::string raw_filename(fn);
-            std::string expanded_filename;
-            if (!expand_props(raw_filename, &expanded_filename)) {
-                LOG(ERROR) << "Could not expand filename '" << raw_filename << "'";
+            auto expanded_filename = ExpandProps(raw_filename);
+
+            if (!expanded_filename) {
+                LOG(ERROR) << "Could not expand filename ': " << expanded_filename.error();
                 continue;
             }
 
-            load_properties_from_file(expanded_filename.c_str(), key, properties);
+            load_properties_from_file(expanded_filename->c_str(), key, properties);
         } else {
             value = strchr(key, '=');
             if (!value) continue;