Clean support

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index dd9d8586d0e8ea72fe17427460aceb04e2b39eca..0222b4445fae3b6b7347e427dab3278b163c99e5 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: packagemanager.cc,v 1.9 1998/12/08 01:34:12 jgg Exp $
+// $Id: packagemanager.cc,v 1.12 1999/01/31 06:24:46 jgg Exp $
 /* ######################################################################
 
    Package Manager - Abstacts the package manager
@@ -107,11 +107,14 @@ bool pkgPackageManager::CreateOrderList()
    delete List;
    List = new pkgOrderList(Cache);
    
+   bool NoImmConfigure = _config->FindB("APT::Immediate-Configure",false);
+   
    // Generate the list of affected packages and sort it
    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
       // Mark the package for immediate configuration
-      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
+      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential &&
+         NoImmConfigure == false)
       {
         List->Flag(I,pkgOrderList::Immediate);
         
@@ -371,7 +374,6 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
    if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
        Cache[Pkg].Keep() == true)
    {
-      cout << "Bailing" << endl;
       List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
       if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
         if (SmartConfigure(Pkg) == false)