Fix "include /foo/*.conf" for single matched object in directory

This commit is contained in:
Andrei Belov 2018-02-16 11:46:46 +03:00 committed by Felipe Zimmerle
parent 3539c59a67
commit ccc1f2031a
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277

View File

@ -75,7 +75,7 @@ std::string find_resource(const std::string& resource,
delete iss; delete iss;
// What about `*' ? // What about `*' ?
if (utils::expandEnv(resource, 0).size() > 1) { if (utils::expandEnv(resource, 0).size() > 0) {
return resource; return resource;
} else { } else {
err->append("'" + resource + "', "); err->append("'" + resource + "', ");
@ -94,7 +94,7 @@ std::string find_resource(const std::string& resource,
delete iss; delete iss;
// What about `*' ? // What about `*' ?
if (utils::expandEnv(f, 0).size() > 1) { if (utils::expandEnv(f, 0).size() > 0) {
return f; return f;
} else { } else {
err->append("'" + f + "'."); err->append("'" + f + "'.");