commit 8c7cbf01a9b4fcf22ea06493e85f3a7e5eea270c
author David Anderson <dvander@google.com> Tue Mar 08 02:56:09 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 08 02:56:09 2022 +0000
tree ed16127bd4ddc498c2e61d7367f51590805b9f45
parent f7187071916abe4a50a7a249e74a01e15ca0f542
parent e5f05202c7a88987b474fdcf0b9b62b25ba86ae3

Merge "init: Skip interface duplicates if service is an override"

init/service_parser.cpp

diff --git a/init/service_parser.cpp b/init/service_parser.cpp
index 57c311a..35bd415 100644
--- a/init/service_parser.cpp
+++ b/init/service_parser.cpp
@@ -202,7 +202,7 @@
     const std::string fullname = interface_name + "/" + instance_name;
 
     for (const auto& svc : *service_list_) {
-        if (svc->interfaces().count(fullname) > 0) {
+        if (svc->interfaces().count(fullname) > 0 && !service_->is_override()) {
             return Error() << "Interface '" << fullname << "' redefined in " << service_->name()
                            << " but is already defined by " << svc->name();
         }