eipp: include global errors in reported error

[apt.git] / apt-pkg / packagemanager.cc

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 173fa80857d3cd56e3873ef61b8a86a01eab41a2..d5afceb6dc6a7824252e9f096d822755040ea8a8 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -1040,7 +1040,13 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
    std::string const planer = _config->Find("APT::Planer", "internal");
    if (planer != "internal")
    {
-      if (EIPP::OrderInstall(planer.c_str(), this, 0, nullptr))
+      unsigned int flags = 0;
+      if (_config->FindB("APT::Immediate-Configure", true) == false)
+        flags |= EIPP::Request::NO_IMMEDIATE_CONFIGURATION;
+      else if (_config->FindB("APT::Immediate-Configure-All", false))
+        flags |= EIPP::Request::IMMEDIATE_CONFIGURATION_ALL;
+
+      if (EIPP::OrderInstall(planer.c_str(), this, flags, nullptr))
         return Completed;
       else
         return Failed;