Dont try to configure packages using SmartConfigure when not performing immediate...

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 874472a47246a73bef869ecd568c233176730d7f..8112c7fa181b14f1ab38813074985c6f2b5d6b1e 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -166,7 +166,7 @@ bool pkgPackageManager::CreateOrderList()
    delete List;
    List = new pkgOrderList(&Cache);
    
    delete List;
    List = new pkgOrderList(&Cache);
    

-   static bool const NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+   NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);

    ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false);
    
    if (Debug && ImmConfigureAll) 
    ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false);
    
    if (Debug && ImmConfigureAll) 


@@ -982,11 +982,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       
       if (List->IsNow(Pkg) == false)
       {
       
       if (List->IsNow(Pkg) == false)
       {

-         if (!List->IsFlag(Pkg,pkgOrderList::Configured)) {
+         if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) {

             if (SmartConfigure(Pkg) == false && Debug)
                _error->Warning("Internal Error, Could not configure %s",Pkg.Name());
             // FIXME: The above warning message might need changing
             if (SmartConfigure(Pkg) == false && Debug)
                _error->Warning("Internal Error, Could not configure %s",Pkg.Name());
             // FIXME: The above warning message might need changing

-         } else {   
+         } else {

            if (Debug == true)
               clog << "Skipping already done " << Pkg.Name() << endl;
         }
            if (Debug == true)
               clog << "Skipping already done " << Pkg.Name() << endl;
         }

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index dcc9dc2a2327f989d117c079b9ef827bd6abd055..d4a25e982958c520fb5e47c8573ec5e118ad0bd4 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -48,6 +48,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;

+   bool NoImmConfigure;

    bool ImmConfigureAll;
 
    /** \brief saves packages dpkg let disappear
    bool ImmConfigureAll;
 
    /** \brief saves packages dpkg let disappear