diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-07-28 09:13:24 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-08-10 23:51:35 +0200 |
| commit | 28557f94578602f9ce0011501a2259bd98ab0688 (patch) | |
| tree | bd7a6e887cc2efd4b360ec3a236b4fc13991006e /apt-pkg/packagemanager.cc | |
| parent | 4326680d2ed23d597f45ca8872a7054368560acc (diff) | |
disable explicit configuration of all packages at the end
With b4450f1dd6bca537e60406b2383ab154a3e1485f we dropped what we
calculated here later on and now that we don't need it in the meantime
either we can just skip the busy work by default and expect dpkg to do
the right thing dropping also our little "last explicit configures"
removal trick introduced in b4450f1dd6bca537e60406b2383ab154a3e1485f.
This enables the last of a bunch of previously experimental options,
some of them existing still, but are very special and hence not really
worth documenting anymore (especially as it would need to be rewritten
now entirely) which is why the documentation is nearly completely
dropped.
The order of configuration stanzas in the simulation code changes
slightly as it isn't concerning itself with finding the 'right' order,
but any order is valid anyhow as long as the entire set happens in the
same call.
Diffstat (limited to 'apt-pkg/packagemanager.cc')
| -rw-r--r-- | apt-pkg/packagemanager.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 3d9c44555..90dd3a3ee 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -315,8 +315,8 @@ bool pkgPackageManager::ConfigureAll() if (OList.OrderConfigure() == false) return false; - std::string const conf = _config->Find("PackageManager::Configure","all"); - bool const ConfigurePkgs = (conf == "all"); + std::string const conf = _config->Find("PackageManager::Configure", "smart"); + bool const ConfigurePkgs = (ImmConfigureAll || conf == "all"); // Perform the configuring for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); ++I) @@ -600,7 +600,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) if (PkgLoop) return true; - static std::string const conf = _config->Find("PackageManager::Configure","all"); + static std::string const conf = _config->Find("PackageManager::Configure", "smart"); static bool const ConfigurePkgs = (conf == "all" || conf == "smart"); if (List->IsFlag(Pkg,pkgOrderList::Configured)) |