From b4f91d4d150a0d9bcc77563abbc03d28da2ff4e3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 26 Jun 2016 13:20:19 +0200 Subject: eipp: enable xz-compressed scenario logging In 385d9f2f23057bc5808b5e013e77ba16d1c94da4 I implemented the storage of scenario files based on enabling this by default for EIPP, but I implemented it first optionally for EDSP to have it independent. The reasons mentioned in the earlier commit (debugging and bugreports) obviously apply here, especially as EIPP solutions aren't user approved, nearly impossible to verify before starting the execution and at the time of error the scenario has changed already, so that reproducing the issue becomes hard(er). --- apt-pkg/packagemanager.cc | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'apt-pkg/packagemanager.cc') diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index a61c5f7a9..898e5d156 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -1033,26 +1033,21 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() return Failed; Reset(); - + if (Debug == true) clog << "Beginning to order" << endl; std::string const planer = _config->Find("APT::Planer", "internal"); + 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; + else if (_config->FindB("APT::Force-LoopBreak", false)) + flags |= EIPP::Request::ALLOW_TEMPORARY_REMOVE_OF_ESSENTIALS; + auto const ret = EIPP::OrderInstall(planer.c_str(), this, flags, nullptr); if (planer != "internal") - { - 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; - else if (_config->FindB("APT::Force-LoopBreak", false)) - flags |= EIPP::Request::ALLOW_TEMPORARY_REMOVE_OF_ESSENTIALS; - - if (EIPP::OrderInstall(planer.c_str(), this, flags, nullptr)) - return Completed; - else - return Failed; - } + return ret ? Completed : Failed; bool const ordering = _config->FindB("PackageManager::UnpackAll",true) ? @@ -1062,7 +1057,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() _error->Error("Internal ordering error"); return Failed; } - + if (Debug == true) clog << "Done ordering" << endl; -- cgit v1.2.3