From b684d8c7b15fbbebb149afac4e374b025c1b335e Mon Sep 17 00:00:00 2001
From: Christopher Baines <cbaines8@gmail.com>
Date: Sat, 16 Jul 2011 22:10:52 +0100
Subject: Dont try to configure packages using SmartConfigure when not
 performing immediate configuration.

---
 apt-pkg/packagemanager.cc | 6 +++---
 apt-pkg/packagemanager.h  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 874472a47..8112c7fa1 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -166,7 +166,7 @@ bool pkgPackageManager::CreateOrderList()
    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) 
@@ -982,11 +982,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       
       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
-         } else {   
+         } else {
 	    if (Debug == true)
 	       clog << "Skipping already done " << Pkg.Name() << endl;
 	 }
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index dcc9dc2a2..d4a25e982 100644
--- 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;
+   bool NoImmConfigure;
    bool ImmConfigureAll;
 
    /** \brief saves packages dpkg let disappear
-- 
cgit v1.2.3