commit e5f05202c7a88987b474fdcf0b9b62b25ba86ae3
author Alexander Koskovich <akoskovich@pm.me> Sun Mar 06 15:51:51 2022 -0700
committer Alexander Koskovich <akoskovich@pm.me> Mon Mar 07 17:07:05 2022 -0700
tree 186357731221ea29cfcdfa69d1fef501aa32e918
parent 5acf7ceb93be4fecceae66ae1492968b54ccfc32

init: Skip interface duplicates if service is an override

These aren't actually duplicate interfaces because we
are overriding the service so interfaces in the original
definition will never be used.

Test: Verify 'm dist' works without complaining about
      duplicate interfaces.

Change-Id: Iab5e1d8bb4cb7d5b2608028c3cee73af94c47424

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();
         }