Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e1bea30 authored by Steven Moreland's avatar Steven Moreland
Browse files

Move service name duplication lookup to EndSection 

This is paving the way to allow an "override" tag
in init services. This also means that errors for
part of a service definition in its section will
be shown in addition to the fact that the service
is duplicated.

Bug: 69050941
Test: boot, init_tests
Change-Id: Ic1ea8597789f45ead1083451b3e933db1524bdc9
parent 7d0a5c36

init/service.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1111,11 +1111,6 @@ Result<Success> ServiceParser::ParseSection(std::vector<std::string>&& args, 
        return Error() << "invalid service name '" << name << "'";

    }



    Service* old_service = service_list_->FindService(name);

    if (old_service) {

        return Error() << "ignored duplicate definition of service '" << name << "'";

    }



    Subcontext* restart_action_subcontext = nullptr;

    if (subcontexts_) {

        for (auto& subcontext : *subcontexts_) {
@@ -1137,6 +1132,11 @@ Result<Success> ServiceParser::ParseLineSection(std::vector<std::string>&& args, 


Result<Success> ServiceParser::EndSection() {

    if (service_) {

        Service* old_service = service_list_->FindService(service_->name());

        if (old_service) {

            return Error() << "ignored duplicate definition of service '" << service_->name() << "'";

        }



        service_list_->AddService(std::move(service_));

    }