commit ff7753a085da011ef35f969b82617fa27e68ea6c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 13 23:40:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 13 23:40:48 2019 +0000
tree d87a214d56f910ccfe49e4f3c245e63bffa665e7
parent 62765e39eeb646d8abb1d63672a77c51b3855eff
parent d972b8b31ae4e46487e32a61cfb42caea9f9377a

Merge "Support importing property file with expanded name"

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index ab5dd61..14bb819 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -645,8 +645,14 @@
                 while (isspace(*key)) key++;
             }
 
-            load_properties_from_file(fn, key, properties);
+            std::string raw_filename(fn);
+            std::string expanded_filename;
+            if (!expand_props(raw_filename, &expanded_filename)) {
+                LOG(ERROR) << "Could not expand filename '" << raw_filename << "'";
+                continue;
+            }
 
+            load_properties_from_file(expanded_filename.c_str(), key, properties);
         } else {
             value = strchr(key, '=');
             if (!value) continue;