X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/ef00bd7af5b2bc0625df58482eacb4c2873c3647..1bae10217617c2f79969635d4387fb2a5fe19ecb:/apt-pkg/edsp.cc diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index abe68065c..2aaffcfc7 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -23,7 +23,8 @@ #include #include #include -#include + +#include #include #include @@ -33,13 +34,39 @@ using std::string; // we could use pkgCache::DepType and ::Priority, but these would be localized strings… -const char * const PrioMap[] = {0, "important", "required", "standard", - "optional", "extra"}; -const char * const DepMap[] = {"", "Depends", "Pre-Depends", "Suggests", - "Recommends" , "Conflicts", "Replaces", - "Obsoletes", "Breaks", "Enhances"}; - +constexpr char const * const PrioMap[] = { + nullptr, "important", "required", "standard", + "optional", "extra" +}; +constexpr char const * const DepMap[] = { + nullptr, "Depends", "Pre-Depends", "Suggests", + "Recommends" , "Conflicts", "Replaces", + "Obsoletes", "Breaks", "Enhances" +}; +// WriteOkay - varaidic helper to easily Write to a FileFd /*{{{*/ +static bool WriteOkay_fn(FileFd &) { return true; } +template static bool WriteOkay_fn(FileFd &output, APT::StringView data, Tail... more_data) +{ + return likely(output.Write(data.data(), data.length()) && WriteOkay_fn(output, more_data...)); +} +template static bool WriteOkay_fn(FileFd &output, unsigned int data, Tail... more_data) +{ + std::string number; + strprintf(number, "%d", data); + return likely(output.Write(number.data(), number.length()) && WriteOkay_fn(output, more_data...)); +} +template static bool WriteOkay(bool &Okay, FileFd &output, Data&&... data) +{ + Okay = likely(Okay && WriteOkay_fn(output, std::forward(data)...)); + return Okay; +} +template static bool WriteOkay(FileFd &output, Data&&... data) +{ + bool Okay = likely(output.Failed() == false); + return WriteOkay(Okay, output, std::forward(data)...); +} + /*}}}*/ // WriteScenarioVersion /*{{{*/ static void WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const &Ver) @@ -87,62 +114,28 @@ static void WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::Pkg if ((Cache[Pkg].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto) fprintf(output, "APT-Automatic: yes\n"); } -static bool WriteScenarioVersion(pkgDepCache &Cache, FileFd &output, pkgCache::PkgIterator const &Pkg, +static bool WriteScenarioVersion(FileFd &output, pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const &Ver) { - bool Okay = output.Write("Package: ") && output.Write(Pkg.Name()); - Okay &= output.Write("\nSource: ") && output.Write(Ver.SourcePkgName()); - Okay &= output.Write("\nArchitecture: ") && output.Write(Ver.Arch()); - Okay &= output.Write("\nVersion: ") && output.Write(Ver.VerStr()); - Okay &= output.Write("\nSource-Version: ") && output.Write(Ver.SourceVerStr()); - if (Pkg.CurrentVer() == Ver) - Okay &= output.Write("\nInstalled: yes"); - if (Pkg->SelectedState == pkgCache::State::Hold || - (Cache[Pkg].Keep() == true && Cache[Pkg].Protect() == true)) - Okay &= output.Write("\nHold: yes"); - std::string aptid; - strprintf(aptid, "\nAPT-ID: %d", Ver->ID); - Okay &= output.Write(aptid); - if (PrioMap[Ver->Priority] != nullptr) - Okay &= output.Write("\nPriority: ") && output.Write(PrioMap[Ver->Priority]); + bool Okay = WriteOkay(output, "Package: ", Pkg.Name(), + "\nArchitecture: ", Ver.Arch(), + "\nVersion: ", Ver.VerStr()); + WriteOkay(Okay, output, "\nAPT-ID: ", Ver->ID); if ((Pkg->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) - Okay &= output.Write("\nEssential: yes"); - if (Ver->Section != 0) - Okay &= output.Write("\nSection: ") && output.Write(Ver.Section()); + WriteOkay(Okay, output, "\nEssential: yes"); if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed) - Okay &= output.Write("\nMulti-Arch: allowed"); + WriteOkay(Okay, output, "\nMulti-Arch: allowed"); else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) - Okay &= output.Write("\nMulti-Arch: foreign"); + WriteOkay(Okay, output, "\nMulti-Arch: foreign"); else if ((Ver->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same) - Okay &= output.Write("\nMulti-Arch: same"); - std::set Releases; - for (pkgCache::VerFileIterator I = Ver.FileList(); I.end() == false; ++I) { - pkgCache::PkgFileIterator File = I.File(); - if (File.Flagged(pkgCache::Flag::NotSource) == false) { - string Release = File.RelStr(); - if (!Release.empty()) - Releases.insert(Release); - } - } - if (!Releases.empty()) { - Okay &= output.Write("\nAPT-Release:"); - for (std::set::iterator R = Releases.begin(); R != Releases.end(); ++R) - Okay &= output.Write("\n ") && output.Write(*R); - } - std::string aptpin; - strprintf(aptpin, "\nAPT-Pin: %d", Cache.GetPolicy().GetPriority(Ver)); - Okay &= output.Write(aptpin); - if (Cache.GetCandidateVersion(Pkg) == Ver) - Okay &= output.Write("\nAPT-Candidate: yes"); - if ((Cache[Pkg].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto) - Okay &= output.Write("\nAPT-Automatic: yes"); + WriteOkay(Okay, output, "\nMulti-Arch: same"); return Okay; } /*}}}*/ // WriteScenarioDependency /*{{{*/ static void WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &Ver) { - std::string dependencies[pkgCache::Dep::Enhances + 1]; + std::array dependencies; bool orGroup = false; for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep) { @@ -161,7 +154,7 @@ static void WriteScenarioDependency( FILE* output, pkgCache::VerIterator const & else orGroup = false; } - for (int i = 1; i < pkgCache::Dep::Enhances + 1; ++i) + for (size_t i = 1; i < dependencies.size(); ++i) if (dependencies[i].empty() == false) fprintf(output, "%s: %s\n", DepMap[i], dependencies[i].c_str()+2); string provides; @@ -178,14 +171,16 @@ static void WriteScenarioDependency( FILE* output, pkgCache::VerIterator const & if (provides.empty() == false) fprintf(output, "Provides: %s\n", provides.c_str()); } -static bool WriteScenarioDependency(FileFd &output, pkgCache::VerIterator const &Ver) +static bool WriteScenarioDependency(FileFd &output, pkgCache::VerIterator const &Ver, bool const OnlyCritical) { - std::string dependencies[pkgCache::Dep::Enhances + 1]; + std::array dependencies; bool orGroup = false; for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep) { if (Dep.IsImplicit() == true) continue; + if (OnlyCritical && Dep.IsCritical() == false) + continue; if (orGroup == false && dependencies[Dep->Type].empty() == false) dependencies[Dep->Type].append(", "); dependencies[Dep->Type].append(Dep.TargetPkg().Name()); @@ -199,10 +194,10 @@ static bool WriteScenarioDependency(FileFd &output, pkgCache::VerIterator const else orGroup = false; } - bool Okay = true; - for (int i = 1; i < pkgCache::Dep::Enhances + 1; ++i) + bool Okay = output.Failed() == false; + for (size_t i = 1; i < dependencies.size(); ++i) if (dependencies[i].empty() == false) - Okay &= output.Write("\n") && output.Write(DepMap[i]) && output.Write(": ") && output.Write(dependencies[i]); + WriteOkay(Okay, output, "\n", DepMap[i], ": ", dependencies[i]); string provides; for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv) { @@ -215,8 +210,8 @@ static bool WriteScenarioDependency(FileFd &output, pkgCache::VerIterator const provides.append(" (= ").append(Prv.ProvideVersion()).append(")"); } if (provides.empty() == false) - Okay &= output.Write("\nProvides: ") && output.Write(provides); - return Okay && output.Write("\n"); + WriteOkay(Okay, output, "\nProvides: ", provides); + return WriteOkay(Okay, output, "\n"); } /*}}}*/ // WriteScenarioLimitedDependency /*{{{*/ @@ -224,7 +219,7 @@ static void WriteScenarioLimitedDependency(FILE* output, pkgCache::VerIterator const &Ver, APT::PackageSet const &pkgset) { - std::string dependencies[pkgCache::Dep::Enhances + 1]; + std::array dependencies; bool orGroup = false; for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep) { @@ -256,7 +251,7 @@ static void WriteScenarioLimitedDependency(FILE* output, else orGroup = false; } - for (int i = 1; i < pkgCache::Dep::Enhances + 1; ++i) + for (size_t i = 1; i < dependencies.size(); ++i) if (dependencies[i].empty() == false) fprintf(output, "%s: %s\n", DepMap[i], dependencies[i].c_str()); string provides; @@ -277,22 +272,25 @@ static void WriteScenarioLimitedDependency(FILE* output, } static bool WriteScenarioLimitedDependency(FileFd &output, pkgCache::VerIterator const &Ver, - APT::PackageSet const &pkgset) + std::vector const &pkgset, + bool const OnlyCritical) { - std::string dependencies[pkgCache::Dep::Enhances + 1]; + std::array dependencies; bool orGroup = false; for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep) { if (Dep.IsImplicit() == true) continue; + if (OnlyCritical && Dep.IsCritical() == false) + continue; if (orGroup == false) { - if (pkgset.find(Dep.TargetPkg()) == pkgset.end()) + if (pkgset[Dep.TargetPkg()->ID] == false) continue; if (dependencies[Dep->Type].empty() == false) dependencies[Dep->Type].append(", "); } - else if (pkgset.find(Dep.TargetPkg()) == pkgset.end()) + else if (pkgset[Dep.TargetPkg()->ID] == false) { if ((Dep->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) continue; @@ -311,16 +309,16 @@ static bool WriteScenarioLimitedDependency(FileFd &output, else orGroup = false; } - bool Okay = true; - for (int i = 1; i < pkgCache::Dep::Enhances + 1; ++i) + bool Okay = output.Failed() == false; + for (size_t i = 1; i < dependencies.size(); ++i) if (dependencies[i].empty() == false) - Okay &= output.Write("\n") && output.Write(DepMap[i]) && output.Write(": ") && output.Write(dependencies[i]); + WriteOkay(Okay, output, "\n", DepMap[i], ": ", dependencies[i]); string provides; for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv) { if (Prv.IsMultiArchImplicit() == true) continue; - if (pkgset.find(Prv.ParentPkg()) == pkgset.end()) + if (pkgset[Prv.ParentPkg()->ID] == false) continue; if (provides.empty() == false) provides.append(", "); @@ -329,8 +327,8 @@ static bool WriteScenarioLimitedDependency(FileFd &output, provides.append(" (= ").append(Prv.ProvideVersion()).append(")"); } if (provides.empty() == false) - Okay &= output.Write("\nProvides: ") && output.Write(provides); - return Okay && output.Write("\n"); + WriteOkay(Okay, output, "\nProvides: ", provides); + return WriteOkay(Okay, output, "\n"); } /*}}}*/ static bool SkipUnavailableVersions(pkgDepCache &Cache, pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const &Ver)/*{{{*/ @@ -351,6 +349,42 @@ static bool SkipUnavailableVersions(pkgDepCache &Cache, pkgCache::PkgIterator co return true; } /*}}}*/ +static bool WriteScenarioEDSPVersion(pkgDepCache &Cache, FileFd &output, pkgCache::PkgIterator const &Pkg,/*{{{*/ + pkgCache::VerIterator const &Ver) +{ + bool Okay = WriteOkay(output, "\nSource: ", Ver.SourcePkgName(), + "\nSource-Version: ", Ver.SourceVerStr()); + if (PrioMap[Ver->Priority] != nullptr) + WriteOkay(Okay, output, "\nPriority: ", PrioMap[Ver->Priority]); + if (Ver->Section != 0) + WriteOkay(Okay, output, "\nSection: ", Ver.Section()); + if (Pkg.CurrentVer() == Ver) + WriteOkay(Okay, output, "\nInstalled: yes"); + if (Pkg->SelectedState == pkgCache::State::Hold || + (Cache[Pkg].Keep() == true && Cache[Pkg].Protect() == true)) + WriteOkay(Okay, output, "\nHold: yes"); + std::set Releases; + for (pkgCache::VerFileIterator I = Ver.FileList(); I.end() == false; ++I) { + pkgCache::PkgFileIterator File = I.File(); + if (File.Flagged(pkgCache::Flag::NotSource) == false) { + string Release = File.RelStr(); + if (!Release.empty()) + Releases.insert(Release); + } + } + if (!Releases.empty()) { + WriteOkay(Okay, output, "\nAPT-Release:"); + for (std::set::iterator R = Releases.begin(); R != Releases.end(); ++R) + WriteOkay(Okay, output, "\n ", *R); + } + WriteOkay(Okay, output, "\nAPT-Pin: ", Cache.GetPolicy().GetPriority(Ver)); + if (Cache.GetCandidateVersion(Pkg) == Ver) + WriteOkay(Okay, output, "\nAPT-Candidate: yes"); + if ((Cache[Pkg].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto) + WriteOkay(Okay, output, "\nAPT-Automatic: yes"); + return Okay; +} + /*}}}*/ // EDSP::WriteScenario - to the given file descriptor /*{{{*/ bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress) { @@ -381,20 +415,21 @@ bool EDSP::WriteScenario(pkgDepCache &Cache, FileFd &output, OpProgress *Progres if (Progress != NULL) Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver")); unsigned long p = 0; - bool Okay = true; + bool Okay = output.Failed() == false; std::vector archs = APT::Configuration::getArchitectures(); - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg) + for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false && likely(Okay); ++Pkg) { std::string const arch = Pkg.Arch(); if (std::find(archs.begin(), archs.end(), arch) == archs.end()) continue; - for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p) + for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false && likely(Okay); ++Ver, ++p) { if (SkipUnavailableVersions(Cache, Pkg, Ver)) continue; - Okay &= WriteScenarioVersion(Cache, output, Pkg, Ver); - Okay &= WriteScenarioDependency(output, Ver); - Okay &= output.Write("\n"); + Okay &= WriteScenarioVersion(output, Pkg, Ver); + Okay &= WriteScenarioEDSPVersion(Cache, output, Pkg, Ver); + Okay &= WriteScenarioDependency(output, Ver, false); + WriteOkay(Okay, output, "\n"); if (Progress != NULL && p % 100 == 0) Progress->Progress(p); } @@ -426,24 +461,29 @@ bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output, return true; } bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FileFd &output, - APT::PackageSet const &pkgset, + std::vector const &pkgset, OpProgress *Progress) { if (Progress != NULL) Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver")); unsigned long p = 0; - bool Okay = true; - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg, ++p) - for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) + bool Okay = output.Failed() == false; + for (auto Pkg = Cache.PkgBegin(); Pkg.end() == false && likely(Okay); ++Pkg, ++p) + { + if (pkgset[Pkg->ID] == false) + continue; + for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false && likely(Okay); ++Ver) { if (SkipUnavailableVersions(Cache, Pkg, Ver)) continue; - Okay &= WriteScenarioVersion(Cache, output, Pkg, Ver); - Okay &= WriteScenarioLimitedDependency(output, Ver, pkgset); - Okay &= output.Write("\n"); + Okay &= WriteScenarioVersion(output, Pkg, Ver); + Okay &= WriteScenarioEDSPVersion(Cache, output, Pkg, Ver); + Okay &= WriteScenarioLimitedDependency(output, Ver, pkgset, false); + WriteOkay(Okay, output, "\n"); if (Progress != NULL && p % 100 == 0) Progress->Progress(p); } + } if (Progress != NULL) Progress->Done(); return Okay; @@ -504,8 +544,8 @@ bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade, fprintf(output, "\n"); return true; } -bool EDSP::WriteRequest(pkgDepCache &Cache, FileFd &output, bool const Upgrade, - bool const DistUpgrade, bool const AutoRemove, +bool EDSP::WriteRequest(pkgDepCache &Cache, FileFd &output, + unsigned int const flags, OpProgress *Progress) { if (Progress != NULL) @@ -527,33 +567,41 @@ bool EDSP::WriteRequest(pkgDepCache &Cache, FileFd &output, bool const Upgrade, continue; req->append(" ").append(Pkg.FullName()); } - bool Okay = output.Write("Request: EDSP 0.5\n"); + bool Okay = WriteOkay(output, "Request: EDSP 0.5\n"); const char *arch = _config->Find("APT::Architecture").c_str(); std::vector archs = APT::Configuration::getArchitectures(); - Okay &= output.Write("Architecture: ") && output.Write(arch) && output.Write("\n"); - Okay &= output.Write("Architectures:"); + WriteOkay(Okay, output, "Architecture: ", arch, "\n", + "Architectures:"); for (std::vector::const_iterator a = archs.begin(); a != archs.end(); ++a) - Okay &= output.Write(" ") && output.Write(*a); - Okay &= output.Write("\n"); + WriteOkay(Okay, output, " ", *a); + WriteOkay(Okay, output, "\n"); if (del.empty() == false) - Okay &= output.Write("Remove:") && output.Write(del) && output.Write("\n"); + WriteOkay(Okay, output, "Remove:", del, "\n"); if (inst.empty() == false) - Okay &= output.Write("Install:") && output.Write(inst) && output.Write("\n"); - if (Upgrade == true) - Okay &= output.Write("Upgrade: yes\n"); - if (DistUpgrade == true) - Okay &= output.Write("Dist-Upgrade: yes\n"); - if (AutoRemove == true) - Okay &= output.Write("Autoremove: yes\n"); + WriteOkay(Okay, output, "Install:", inst, "\n"); + if (flags & Request::AUTOREMOVE) + WriteOkay(Okay, output, "Autoremove: yes\n"); + if (flags & Request::UPGRADE_ALL) + { + WriteOkay(Okay, output, "Upgrade-All: yes\n"); + if (flags & (Request::FORBID_NEW_INSTALL | Request::FORBID_REMOVE)) + WriteOkay(Okay, output, "Upgrade: yes\n"); + else + WriteOkay(Okay, output, "Dist-Upgrade: yes\n"); + } + if (flags & Request::FORBID_NEW_INSTALL) + WriteOkay(Okay, output, "Forbid-New-Install: yes\n"); + if (flags & Request::FORBID_REMOVE) + WriteOkay(Okay, output, "Forbid-Remove: yes\n"); if (_config->FindB("APT::Solver::Strict-Pinning", true) == false) - Okay &= output.Write("Strict-Pinning: no\n"); + WriteOkay(Okay, output, "Strict-Pinning: no\n"); string solverpref("APT::Solver::"); solverpref.append(_config->Find("APT::Solver", "internal")).append("::Preferences"); if (_config->Exists(solverpref) == true) - Okay &= output.Write("Preferences: ") && output.Write(_config->Find(solverpref,"")) && output.Write("\n"); - return Okay && output.Write("\n"); + WriteOkay(Okay, output, "Preferences: ", _config->Find(solverpref,""), "\n"); + return WriteOkay(Okay, output, "\n"); } /*}}}*/ // EDSP::ReadResponse - from the given file descriptor /*{{{*/ @@ -687,16 +735,25 @@ static bool StringToBool(char const *answer, bool const defValue) { return defValue; } /*}}}*/ +static bool ReadFlag(unsigned int &flags, std::string const &line, APT::StringView const name, unsigned int const setflag)/*{{{*/ +{ + if (line.compare(0, name.length(), name.data()) != 0) + return false; + auto const l = line.c_str() + name.length() + 1; + if (StringToBool(l, false)) + flags |= setflag; + else + flags &= ~setflag; + return true; +} + /*}}}*/ // EDSP::ReadRequest - first stanza from the given file descriptor /*{{{*/ bool EDSP::ReadRequest(int const input, std::list &install, - std::list &remove, bool &upgrade, - bool &distUpgrade, bool &autoRemove) + std::list &remove, unsigned int &flags) { install.clear(); remove.clear(); - upgrade = false; - distUpgrade = false; - autoRemove = false; + flags = 0; std::string line; while (ReadLine(input, line) == true) { @@ -724,12 +781,13 @@ bool EDSP::ReadRequest(int const input, std::list &install, line.erase(0, 7); request = &remove; } - else if (line.compare(0, 8, "Upgrade:") == 0) - upgrade = StringToBool(line.c_str() + 9, false); - else if (line.compare(0, 13, "Dist-Upgrade:") == 0) - distUpgrade = StringToBool(line.c_str() + 14, false); - else if (line.compare(0, 11, "Autoremove:") == 0) - autoRemove = StringToBool(line.c_str() + 12, false); + else if (ReadFlag(flags, line, "Upgrade:", (Request::UPGRADE_ALL | Request::FORBID_REMOVE | Request::FORBID_NEW_INSTALL)) || + ReadFlag(flags, line, "Dist-Upgrade:", Request::UPGRADE_ALL) || + ReadFlag(flags, line, "Upgrade-All:", Request::UPGRADE_ALL) || + ReadFlag(flags, line, "Forbid-New-Install:", Request::FORBID_NEW_INSTALL) || + ReadFlag(flags, line, "Forbid-Remove:", Request::FORBID_REMOVE) || + ReadFlag(flags, line, "Autoremove:", Request::AUTOREMOVE)) + ; else if (line.compare(0, 13, "Architecture:") == 0) _config->Set("APT::Architecture", line.c_str() + 14); else if (line.compare(0, 14, "Architectures:") == 0) @@ -760,6 +818,31 @@ bool EDSP::ReadRequest(int const input, std::list &install, } } return false; +} +bool EDSP::ReadRequest(int const input, std::list &install, + std::list &remove, bool &upgrade, + bool &distUpgrade, bool &autoRemove) +{ + unsigned int flags; + auto const ret = ReadRequest(input, install, remove, flags); + autoRemove = (flags & Request::AUTOREMOVE); + if (flags & Request::UPGRADE_ALL) + { + if (flags & (Request::FORBID_NEW_INSTALL | Request::FORBID_REMOVE)) + { + upgrade = true; + distUpgrade = false; + } else { + upgrade = false; + distUpgrade = false; + } + } + else + { + upgrade = false; + distUpgrade = false; + } + return ret; } /*}}}*/ // EDSP::ApplyRequest - first stanza from the given file descriptor /*{{{*/ @@ -822,34 +905,30 @@ bool EDSP::WriteSolution(pkgDepCache &Cache, FILE* output) bool EDSP::WriteSolution(pkgDepCache &Cache, FileFd &output) { bool const Debug = _config->FindB("Debug::EDSP::WriteSolution", false); - bool Okay = true; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg) + bool Okay = output.Failed() == false; + for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false && likely(Okay); ++Pkg) { std::string action; if (Cache[Pkg].Delete() == true) - strprintf(action, "Remove: %d\n", Pkg.CurrentVer()->ID); + WriteOkay(Okay, output, "Remove: ", Pkg.CurrentVer()->ID, "\n"); else if (Cache[Pkg].NewInstall() == true || Cache[Pkg].Upgrade() == true) - strprintf(action, "Install: %d\n", Cache.GetCandidateVersion(Pkg)->ID); + WriteOkay(Okay, output, "Install: ", Cache.GetCandidateVersion(Pkg)->ID, "\n"); else if (Cache[Pkg].Garbage == true) - strprintf(action, "Autoremove: %d\n", Pkg.CurrentVer()->ID); + WriteOkay(Okay, output, "Autoremove: ", Pkg.CurrentVer()->ID, "\n"); else continue; - Okay &= output.Write(action); - if (Debug) { - Okay &= output.Write("Package: ") && output.Write(Pkg.FullName()) && output.Write("\nVersion: "); + WriteOkay(Okay, output, "Package: ", Pkg.FullName(), "\nVersion: "); if (Cache[Pkg].Delete() == true || Cache[Pkg].Garbage == true) - Okay &= output.Write(Pkg.CurrentVer().VerStr()); + WriteOkay(Okay, output, Pkg.CurrentVer().VerStr(), "\n\n"); else - Okay &= output.Write(Cache.GetCandidateVersion(Pkg).VerStr()); - Okay &= output.Write("\n\n"); + WriteOkay(Okay, output, Cache.GetCandidateVersion(Pkg).VerStr(), "\n\n"); } else - Okay &= output.Write("\n"); + WriteOkay(Okay, output, "\n"); } - return Okay; } /*}}}*/ @@ -862,12 +941,9 @@ bool EDSP::WriteProgress(unsigned short const percent, const char* const message return true; } bool EDSP::WriteProgress(unsigned short const percent, const char* const message, FileFd &output) { - std::string strpercent; - strprintf(strpercent, "Percentage: %d\n", percent); - return output.Write("Progress: ") && output.Write(TimeRFC1123(time(NULL))) && output.Write("\n") && - output.Write(strpercent) && output.Write("Message: ") && output.Write(message) && output.Write("\n\n") && - output.Flush(); - + return WriteOkay(output, "Progress: ", TimeRFC1123(time(NULL)), "\n", + "Percentage: ", percent, "\n", + "Message: ", message, "\n\n") && output.Flush(); } /*}}}*/ // EDSP::WriteError - format an error message to be send to file descriptor /*{{{*/ @@ -877,18 +953,17 @@ bool EDSP::WriteError(char const * const uuid, std::string const &message, FILE* return true; } bool EDSP::WriteError(char const * const uuid, std::string const &message, FileFd &output) { - return output.Write("Error: ") && output.Write(uuid) && output.Write("\n") && - output.Write("Message: ") && output.Write(SubstVar(SubstVar(message, "\n\n", "\n.\n"), "\n", "\n ")) && - output.Write("\n\n"); + return WriteOkay(output, "Error: ", uuid, "\n", + "Message: ", SubstVar(SubstVar(message, "\n\n", "\n.\n"), "\n", "\n "), + "\n\n"); } /*}}}*/ -// EDSP::ExecuteSolver - fork requested solver and setup ipc pipes {{{*/ -pid_t EDSP::ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool) { - std::vector const solverDirs = _config->FindVector("Dir::Bin::Solvers"); +static pid_t ExecuteExternal(char const* const type, char const * const binary, char const * const configdir, int * const solver_in, int * const solver_out) {/*{{{*/ + std::vector const solverDirs = _config->FindVector(configdir); std::string file; for (std::vector::const_iterator dir = solverDirs.begin(); dir != solverDirs.end(); ++dir) { - file = flCombine(*dir, solver); + file = flCombine(*dir, binary); if (RealFileExists(file.c_str()) == true) break; file.clear(); @@ -896,7 +971,7 @@ pid_t EDSP::ExecuteSolver(const char* const solver, int * const solver_in, int * if (file.empty() == true) { - _error->Error("Can't call external solver '%s' as it is not in a configured directory!", solver); + _error->Error("Can't call external %s '%s' as it is not in a configured directory!", type, binary); return 0; } int external[4] = {-1, -1, -1, -1}; @@ -914,7 +989,7 @@ pid_t EDSP::ExecuteSolver(const char* const solver, int * const solver_in, int * dup2(external[3], STDOUT_FILENO); const char* calling[2] = { file.c_str(), 0 }; execv(calling[0], (char**) calling); - std::cerr << "Failed to execute solver '" << solver << "'!" << std::endl; + std::cerr << "Failed to execute " << type << " '" << binary << "'!" << std::endl; _exit(100); } close(external[0]); @@ -922,13 +997,18 @@ pid_t EDSP::ExecuteSolver(const char* const solver, int * const solver_in, int * if (WaitFd(external[1], true, 5) == false) { - _error->Errno("Resolve", "Timed out while Waiting on availability of solver stdin"); + _error->Errno("Resolve", "Timed out while Waiting on availability of %s stdin", type); return 0; } *solver_in = external[1]; *solver_out = external[2]; return Solver; +} + /*}}}*/ +// EDSP::ExecuteSolver - fork requested solver and setup ipc pipes {{{*/ +pid_t EDSP::ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool) { + return ExecuteExternal("solver", solver, "Dir::Bin::Solvers", solver_in, solver_out); } bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_out) { if (ExecuteSolver(solver, solver_in, solver_out, true) == 0) @@ -938,8 +1018,7 @@ bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_o /*}}}*/ // EDSP::ResolveExternal - resolve problems by asking external for help {{{*/ bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache, - bool const upgrade, bool const distUpgrade, - bool const autoRemove, OpProgress *Progress) { + unsigned int const flags, OpProgress *Progress) { int solver_in, solver_out; pid_t const solver_pid = EDSP::ExecuteSolver(solver, &solver_in, &solver_out, true); if (solver_pid == 0) @@ -949,19 +1028,32 @@ bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache, if (output.OpenDescriptor(solver_in, FileFd::WriteOnly | FileFd::BufferedWrite, true) == false) return _error->Errno("ResolveExternal", "Opening solver %s stdin on fd %d for writing failed", solver, solver_in); + bool Okay = output.Failed() == false; if (Progress != NULL) Progress->OverallProgress(0, 100, 5, _("Execute external solver")); - EDSP::WriteRequest(Cache, output, upgrade, distUpgrade, autoRemove, Progress); + Okay &= EDSP::WriteRequest(Cache, output, flags, Progress); if (Progress != NULL) Progress->OverallProgress(5, 100, 20, _("Execute external solver")); - EDSP::WriteScenario(Cache, output, Progress); + Okay &= EDSP::WriteScenario(Cache, output, Progress); output.Close(); if (Progress != NULL) Progress->OverallProgress(25, 100, 75, _("Execute external solver")); - if (EDSP::ReadResponse(solver_out, Cache, Progress) == false) + if (Okay && EDSP::ReadResponse(solver_out, Cache, Progress) == false) return false; return ExecWait(solver_pid, solver); +} +bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache, + bool const upgrade, bool const distUpgrade, + bool const autoRemove, OpProgress *Progress) { + unsigned int flags = 0; + if (autoRemove) + flags |= Request::AUTOREMOVE; + if (upgrade) + flags |= Request::UPGRADE_ALL | Request::FORBID_REMOVE | Request::FORBID_NEW_INSTALL; + if (distUpgrade) + flags |= Request::UPGRADE_ALL; + return ResolveExternal(solver, Cache, flags, Progress); } /*}}}*/