From 8e99b22c31eb47d0422e9a69e83dc99bb315ded8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 29 Jun 2016 09:16:53 +0200 Subject: eipp: let apt make a plan, not make stuff plane Julian noticed on IRC that I fall victim to a lovely false friend by calling referring to a 'planer' all the time even through these are machines to e.g. remove splinters from woodwork ("make stuff plane"). The term I meant is written in german in this way (= with a single n) but in english there are two, aka: 'planner'. As that is unreleased code switching all instances without any transitional provisions. Also the reason why its skipped in changelog. Thanks: Julian Andres Klode Gbp-Dch: Ignore --- cmdline/apt-internal-planer.cc | 196 ---------------------------------------- cmdline/apt-internal-planner.cc | 196 ++++++++++++++++++++++++++++++++++++++++ cmdline/makefile | 6 +- 3 files changed, 199 insertions(+), 199 deletions(-) delete mode 100644 cmdline/apt-internal-planer.cc create mode 100644 cmdline/apt-internal-planner.cc (limited to 'cmdline') diff --git a/cmdline/apt-internal-planer.cc b/cmdline/apt-internal-planer.cc deleted file mode 100644 index 2d5f44c6a..000000000 --- a/cmdline/apt-internal-planer.cc +++ /dev/null @@ -1,196 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/* ##################################################################### - - cover around the internal solver to be able to run it like an external - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - /*}}}*/ - -static bool ShowHelp(CommandLine &) /*{{{*/ -{ - std::cout << - _("Usage: apt-internal-planer\n" - "\n" - "apt-internal-planer is an interface to use the current internal\n" - "installation planer for the APT family like an external one,\n" - "for debugging or the like.\n"); - return true; -} - /*}}}*/ -APT_NORETURN static void DIE(std::string const &message) { /*{{{*/ - std::cerr << "ERROR: " << message << std::endl; - _error->DumpErrors(std::cerr); - exit(EXIT_FAILURE); -} - /*}}}*/ -static std::vector GetCommands() /*{{{*/ -{ - return {}; -} - /*}}}*/ -class PMOutput: public pkgPackageManager /*{{{*/ -{ - FileFd &output; - bool const Debug; - -protected: - virtual bool Install(PkgIterator Pkg,std::string) APT_OVERRIDE - { - //std::cerr << "INSTALL: " << APT::PrettyPkg(&Cache, Pkg) << std::endl; - return EDSP::WriteSolutionStanza(output, "Unpack", Cache[Pkg].InstVerIter(Cache)); - } - virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE - { - //std::cerr << "CONFIGURE: " << APT::PrettyPkg(&Cache, Pkg) << " " << std::endl; - return EDSP::WriteSolutionStanza(output, "Configure", Cache[Pkg].InstVerIter(Cache)); - } - virtual bool Remove(PkgIterator Pkg,bool) APT_OVERRIDE - { - //std::cerr << "REMOVE: " << APT::PrettyPkg(&Cache, Pkg) << " " << std::endl; - return EDSP::WriteSolutionStanza(output, "Remove", Pkg.CurrentVer()); - } -public: - PMOutput(pkgDepCache *Cache, FileFd &file) : pkgPackageManager(Cache), output(file), - Debug(_config->FindB("Debug::EDSP::WriteSolution", false)) - {} - - bool ApplyRequest(std::list> const &actions) - { - for (auto && a: actions) - { - auto const Pkg = Cache.FindPkg(a.first); - if (unlikely(Pkg.end() == true)) - continue; - switch (a.second) - { - case EIPP::PKG_ACTION::NOOP: - break; - case EIPP::PKG_ACTION::INSTALL: - case EIPP::PKG_ACTION::REINSTALL: - FileNames[Pkg->ID] = "EIPP"; - break; - case EIPP::PKG_ACTION::REMOVE: - break; - } - } - return true; - } -}; - /*}}}*/ -int main(int argc,const char *argv[]) /*{{{*/ -{ - // we really don't need anything - DropPrivileges(); - - CommandLine CmdL; - ParseCommandLine(CmdL, APT_CMD::APT_INTERNAL_PLANER, &_config, NULL, argc, argv, &ShowHelp, &GetCommands); - - // Deal with stdout not being a tty - if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) - _config->Set("quiet","1"); - - if (_config->FindI("quiet", 0) < 1) - _config->Set("Debug::EIPP::WriteSolution", true); - - _config->Set("APT::System", "Debian APT planer interface"); - _config->Set("APT::Planer", "internal"); - _config->Set("eipp::scenario", "/nonexistent/stdin"); - FileFd output; - if (output.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::BufferedWrite, true) == false) - DIE("stdout couldn't be opened"); - int const input = STDIN_FILENO; - SetNonBlock(input, false); - - EDSP::WriteProgress(0, "Start up planer…", output); - - if (pkgInitSystem(*_config,_system) == false) - DIE("System could not be initialized!"); - - EDSP::WriteProgress(1, "Read request…", output); - - if (WaitFd(input, false, 5) == false) - DIE("WAIT timed out in the planer"); - - std::list> actions; - unsigned int flags; - if (EIPP::ReadRequest(input, actions, flags) == false) - DIE("Parsing the request failed!"); - _config->Set("APT::Immediate-Configure", (flags & EIPP::Request::NO_IMMEDIATE_CONFIGURATION) == 0); - _config->Set("APT::Immediate-Configure-All", (flags & EIPP::Request::IMMEDIATE_CONFIGURATION_ALL) != 0); - _config->Set("APT::Force-LoopBreak", (flags & EIPP::Request::ALLOW_TEMPORARY_REMOVE_OF_ESSENTIALS) != 0); - - EDSP::WriteProgress(5, "Read scenario…", output); - - pkgCacheFile CacheFile; - if (CacheFile.Open(NULL, false) == false) - DIE("Failed to open CacheFile!"); - - EDSP::WriteProgress(50, "Apply request on scenario…", output); - - if (EIPP::ApplyRequest(actions, CacheFile) == false) - DIE("Failed to apply request to depcache!"); - - EDSP::WriteProgress(60, "Call orderinstall on current scenario…", output); - - //_config->Set("Debug::pkgOrderList", true); - //_config->Set("Debug::pkgPackageManager", true); - PMOutput PM(CacheFile, output); - if (PM.ApplyRequest(actions) == false) - DIE("Failed to apply request to packagemanager!"); - pkgPackageManager::OrderResult const Res = PM.DoInstallPreFork(); - std::ostringstream broken; - switch (Res) - { - case pkgPackageManager::Completed: - EDSP::WriteProgress(100, "Done", output); - break; - case pkgPackageManager::Incomplete: - broken << "Planer could only incompletely plan an installation order!" << std::endl; - _error->DumpErrors(broken, GlobalError::DEBUG); - EDSP::WriteError("pm-incomplete", broken.str(), output); - break; - case pkgPackageManager::Failed: - broken << "Planer failed to find an installation order!" << std::endl; - _error->DumpErrors(broken, GlobalError::DEBUG); - EDSP::WriteError("pm-failed", broken.str(), output); - break; - } - - return DispatchCommandLine(CmdL, {}); -} - /*}}}*/ diff --git a/cmdline/apt-internal-planner.cc b/cmdline/apt-internal-planner.cc new file mode 100644 index 000000000..1f74aa78f --- /dev/null +++ b/cmdline/apt-internal-planner.cc @@ -0,0 +1,196 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ##################################################################### + + cover around the internal solver to be able to run it like an external + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + /*}}}*/ + +static bool ShowHelp(CommandLine &) /*{{{*/ +{ + std::cout << + _("Usage: apt-internal-planner\n" + "\n" + "apt-internal-planner is an interface to use the current internal\n" + "installation planner for the APT family like an external one,\n" + "for debugging or the like.\n"); + return true; +} + /*}}}*/ +APT_NORETURN static void DIE(std::string const &message) { /*{{{*/ + std::cerr << "ERROR: " << message << std::endl; + _error->DumpErrors(std::cerr); + exit(EXIT_FAILURE); +} + /*}}}*/ +static std::vector GetCommands() /*{{{*/ +{ + return {}; +} + /*}}}*/ +class PMOutput: public pkgPackageManager /*{{{*/ +{ + FileFd &output; + bool const Debug; + +protected: + virtual bool Install(PkgIterator Pkg,std::string) APT_OVERRIDE + { + //std::cerr << "INSTALL: " << APT::PrettyPkg(&Cache, Pkg) << std::endl; + return EDSP::WriteSolutionStanza(output, "Unpack", Cache[Pkg].InstVerIter(Cache)); + } + virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE + { + //std::cerr << "CONFIGURE: " << APT::PrettyPkg(&Cache, Pkg) << " " << std::endl; + return EDSP::WriteSolutionStanza(output, "Configure", Cache[Pkg].InstVerIter(Cache)); + } + virtual bool Remove(PkgIterator Pkg,bool) APT_OVERRIDE + { + //std::cerr << "REMOVE: " << APT::PrettyPkg(&Cache, Pkg) << " " << std::endl; + return EDSP::WriteSolutionStanza(output, "Remove", Pkg.CurrentVer()); + } +public: + PMOutput(pkgDepCache *Cache, FileFd &file) : pkgPackageManager(Cache), output(file), + Debug(_config->FindB("Debug::EDSP::WriteSolution", false)) + {} + + bool ApplyRequest(std::list> const &actions) + { + for (auto && a: actions) + { + auto const Pkg = Cache.FindPkg(a.first); + if (unlikely(Pkg.end() == true)) + continue; + switch (a.second) + { + case EIPP::PKG_ACTION::NOOP: + break; + case EIPP::PKG_ACTION::INSTALL: + case EIPP::PKG_ACTION::REINSTALL: + FileNames[Pkg->ID] = "EIPP"; + break; + case EIPP::PKG_ACTION::REMOVE: + break; + } + } + return true; + } +}; + /*}}}*/ +int main(int argc,const char *argv[]) /*{{{*/ +{ + // we really don't need anything + DropPrivileges(); + + CommandLine CmdL; + ParseCommandLine(CmdL, APT_CMD::APT_INTERNAL_PLANNER, &_config, NULL, argc, argv, &ShowHelp, &GetCommands); + + // Deal with stdout not being a tty + if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) + _config->Set("quiet","1"); + + if (_config->FindI("quiet", 0) < 1) + _config->Set("Debug::EIPP::WriteSolution", true); + + _config->Set("APT::System", "Debian APT planner interface"); + _config->Set("APT::Planner", "internal"); + _config->Set("eipp::scenario", "/nonexistent/stdin"); + FileFd output; + if (output.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::BufferedWrite, true) == false) + DIE("stdout couldn't be opened"); + int const input = STDIN_FILENO; + SetNonBlock(input, false); + + EDSP::WriteProgress(0, "Start up planner…", output); + + if (pkgInitSystem(*_config,_system) == false) + DIE("System could not be initialized!"); + + EDSP::WriteProgress(1, "Read request…", output); + + if (WaitFd(input, false, 5) == false) + DIE("WAIT timed out in the planner"); + + std::list> actions; + unsigned int flags; + if (EIPP::ReadRequest(input, actions, flags) == false) + DIE("Parsing the request failed!"); + _config->Set("APT::Immediate-Configure", (flags & EIPP::Request::NO_IMMEDIATE_CONFIGURATION) == 0); + _config->Set("APT::Immediate-Configure-All", (flags & EIPP::Request::IMMEDIATE_CONFIGURATION_ALL) != 0); + _config->Set("APT::Force-LoopBreak", (flags & EIPP::Request::ALLOW_TEMPORARY_REMOVE_OF_ESSENTIALS) != 0); + + EDSP::WriteProgress(5, "Read scenario…", output); + + pkgCacheFile CacheFile; + if (CacheFile.Open(NULL, false) == false) + DIE("Failed to open CacheFile!"); + + EDSP::WriteProgress(50, "Apply request on scenario…", output); + + if (EIPP::ApplyRequest(actions, CacheFile) == false) + DIE("Failed to apply request to depcache!"); + + EDSP::WriteProgress(60, "Call orderinstall on current scenario…", output); + + //_config->Set("Debug::pkgOrderList", true); + //_config->Set("Debug::pkgPackageManager", true); + PMOutput PM(CacheFile, output); + if (PM.ApplyRequest(actions) == false) + DIE("Failed to apply request to packagemanager!"); + pkgPackageManager::OrderResult const Res = PM.DoInstallPreFork(); + std::ostringstream broken; + switch (Res) + { + case pkgPackageManager::Completed: + EDSP::WriteProgress(100, "Done", output); + break; + case pkgPackageManager::Incomplete: + broken << "Planner could only incompletely plan an installation order!" << std::endl; + _error->DumpErrors(broken, GlobalError::DEBUG); + EDSP::WriteError("pm-incomplete", broken.str(), output); + break; + case pkgPackageManager::Failed: + broken << "Planner failed to find an installation order!" << std::endl; + _error->DumpErrors(broken, GlobalError::DEBUG); + EDSP::WriteError("pm-failed", broken.str(), output); + break; + } + + return DispatchCommandLine(CmdL, {}); +} + /*}}}*/ diff --git a/cmdline/makefile b/cmdline/makefile index ee50224e1..8b79ce05f 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -79,17 +79,17 @@ LIB_MAKES = apt-pkg/makefile apt-inst/makefile apt-private/makefile SOURCE = apt-extracttemplates.cc include $(PROGRAM_H) -# The internal solver/planer acting as an external +# The internal solver/planner acting as an external PROGRAM=apt-internal-solver SLIBS = -lapt-pkg -lapt-private $(INTLLIBS) LIB_MAKES = apt-pkg/makefile apt-private/makefile SOURCE = apt-internal-solver.cc include $(PROGRAM_H) -PROGRAM=apt-internal-planer +PROGRAM=apt-internal-planner SLIBS = -lapt-pkg -lapt-private $(INTLLIBS) LIB_MAKES = apt-pkg/makefile apt-private/makefile -SOURCE = apt-internal-planer.cc +SOURCE = apt-internal-planner.cc include $(PROGRAM_H) # This just dumps out the state -- cgit v1.2.3