From abbe74b2b4690b9138da94d26a7e45ad80a3bf6c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 29 Dec 2016 12:41:23 +0100 Subject: allow default build-essentials to be overridden The config list APT::Build-Essential gets a similar treatment to other lists now by having the value of the option itself be an override for the list allowing to disable build-essentials entirely as well as adding/overriding as usual by now in other lists. Reported-By: Johannes 'josch' Schauer on IRC --- apt-private/private-source.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'apt-private') diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc index 5cd0a6628..96344d7ab 100644 --- a/apt-private/private-source.cc +++ b/apt-private/private-source.cc @@ -668,16 +668,12 @@ bool DoBuildDep(CommandLine &CmdL) // deal with the build essentials first { std::vector BuildDeps; - Configuration::Item const *Opts = _config->Tree("APT::Build-Essential"); - if (Opts) - Opts = Opts->Child; - for (; Opts; Opts = Opts->Next) + for (auto && opt: _config->FindVector("APT::Build-Essential")) { - if (Opts->Value.empty() == true) + if (opt.empty()) continue; - pkgSrcRecords::Parser::BuildDepRec rec; - rec.Package = Opts->Value; + rec.Package = std::move(opt); rec.Type = pkgSrcRecords::Parser::BuildDependIndep; rec.Op = 0; BuildDeps.push_back(rec); -- cgit v1.2.3