]> git.saurik.com Git - apt.git/blobdiff - apt-pkg/packagemanager.cc
call dpkg with --no-triggers by default
[apt.git] / apt-pkg / packagemanager.cc
index 8112c7fa181b14f1ab38813074985c6f2b5d6b1e..7fdd0393f33473b22b980959db98de0fd279d7ad 100644 (file)
@@ -6,37 +6,52 @@
    Package Manager - Abstacts the package manager
 
    More work is needed in the area of transitioning provides, ie exim
-   replacing smail. This can cause interesing side effects.
+   replacing smail. This can cause interesting side effects.
 
    Other cases involving conflicts+replaces should be tested. 
    
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
+#include <config.h>
+
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/edsp.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/sptr.h>
-    
-#include <apti18n.h>    
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/install-progress.h>
+#include <apt-pkg/prettyprinters.h>
+
+#include <stddef.h>
+#include <list>
+#include <string>
 #include <iostream>
-#include <fcntl.h> 
+
+#include <apti18n.h>
                                                                        /*}}}*/
 using namespace std;
 
+bool pkgPackageManager::SigINTStop = false;
+
 // PM::PackageManager - Constructor                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgPackageManager::pkgPackageManager(pkgDepCache *pCache) : Cache(*pCache)
+pkgPackageManager::pkgPackageManager(pkgDepCache *pCache) : Cache(*pCache),
+                                                           List(NULL), Res(Incomplete), d(NULL)
 {
    FileNames = new string[Cache.Head().PackageCount];
-   List = 0;
    Debug = _config->FindB("Debug::pkgPackageManager",false);
+   NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+   ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false);
 }
                                                                        /*}}}*/
 // PM::PackageManager - Destructor                                     /*{{{*/
@@ -63,7 +78,7 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
    if (ordering == false)
       return _error->Error("Internal ordering error");
 
-   for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
+   for (pkgOrderList::iterator I = List->begin(); I != List->end(); ++I)
    {
       PkgIterator Pkg(Cache,*I);
       FileNames[Pkg->ID] = string();
@@ -99,7 +114,7 @@ bool pkgPackageManager::FixMissing()
    List->SetFileList(FileNames);
 
    bool Bad = false;
-   for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
+   for (PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
    {
       if (List->IsMissing(I) == false)
         continue;
@@ -123,7 +138,7 @@ bool pkgPackageManager::FixMissing()
 // PM::ImmediateAdd - Add the immediate flag recursivly                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This adds the immediate flag to the pkg and recursively to the
-   dependendies 
+   dependencies
  */
 void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
 {
@@ -140,13 +155,13 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned
       D = I.CurrentVer().DependsList(); 
    }
 
-   for ( /* nothing */  ; D.end() == false; D++)
+   for ( /* nothing */  ; D.end() == false; ++D)
       if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
       {
         if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))
         {
            if(Debug)
-              clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.Name() << endl;
+              clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << APT::PrettyPkg(&Cache, D.TargetPkg()) << " cause of " << D.DepType() << " " << I.FullName() << endl;
            List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
            ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1);
         }
@@ -165,27 +180,23 @@ bool pkgPackageManager::CreateOrderList()
    
    delete List;
    List = new pkgOrderList(&Cache);
-   
-   NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
-   ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false);
-   
+
    if (Debug && ImmConfigureAll) 
       clog << "CreateOrderList(): Adding Immediate flag for all packages because of APT::Immediate-Configure-All" << endl;
    
    // Generate the list of affected packages and sort it
-   for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
+   for (PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
    {
       // Ignore no-version packages
       if (I->VersionList == 0)
         continue;
       
-      // Mark the package and its dependends for immediate configuration
-      if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
-          (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
+      // Mark the package and its dependents for immediate configuration
+      if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
          NoImmConfigure == false) || ImmConfigureAll)
       {
         if(Debug && !ImmConfigureAll)
-           clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl;
+           clog << "CreateOrderList(): Adding Immediate flag for " << I.FullName() << endl;
         List->Flag(I,pkgOrderList::Immediate);
         
         if (!ImmConfigureAll) {
@@ -213,7 +224,7 @@ bool pkgPackageManager::CreateOrderList()
    return true;
 }
                                                                        /*}}}*/
-// PM::DepAlwaysTrue - Returns true if this dep is irrelevent          /*{{{*/
+// PM::DepAlwaysTrue - Returns true if this dep is irrelevant          /*{{{*/
 // ---------------------------------------------------------------------
 /* The restriction on provides is to eliminate the case when provides
    are transitioning between valid states [ie exim to smail] */
@@ -235,26 +246,53 @@ bool pkgPackageManager::DepAlwaysTrue(DepIterator D)
 bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
                                        const char *Ver)
 {
-   for (;D.end() == false; D++)
+   for (;D.end() == false; ++D)
    {
       if (D->Type != pkgCache::Dep::Conflicts &&
          D->Type != pkgCache::Dep::Obsoletes)
         continue;
 
-      // The package hasnt been changed
+      // The package hasn't been changed
       if (List->IsNow(Pkg) == false)
         continue;
       
-      // Ignore self conflicts, ignore conflicts from irrelevent versions
-      if (D.ParentPkg() == Pkg || D.ParentVer() != D.ParentPkg().CurrentVer())
+      // Ignore self conflicts, ignore conflicts from irrelevant versions
+      if (D.IsIgnorable(Pkg) || D.ParentVer() != D.ParentPkg().CurrentVer())
         continue;
       
       if (Cache.VS().CheckDep(Ver,D->CompareOp,D.TargetVer()) == false)
         continue;
 
-      if (EarlyRemove(D.ParentPkg()) == false)
+      if (EarlyRemove(D.ParentPkg(), &D) == false)
         return _error->Error("Reverse conflicts early remove for package '%s' failed",
-                             Pkg.Name());
+                             Pkg.FullName().c_str());
+   }
+   return true;
+}
+                                                                       /*}}}*/
+// PM::CheckRBreaks - Look for reverse breaks                          /*{{{*/
+bool pkgPackageManager::CheckRBreaks(PkgIterator const &Pkg, DepIterator D,
+                                    const char * const Ver)
+{
+   for (;D.end() == false; ++D)
+   {
+      if (D->Type != pkgCache::Dep::DpkgBreaks)
+        continue;
+
+      PkgIterator const DP = D.ParentPkg();
+      if (Cache[DP].Delete() == false)
+        continue;
+
+      // Ignore self conflicts, ignore conflicts from irrelevant versions
+      if (D.IsIgnorable(Pkg) || D.ParentVer() != DP.CurrentVer())
+        continue;
+
+      if (Cache.VS().CheckDep(Ver, D->CompareOp, D.TargetVer()) == false)
+        continue;
+
+      // no earlyremove() here as user has already agreed to the permanent removal
+      if (SmartRemove(DP) == false)
+        return _error->Error("Internal Error, Could not early remove %s (%d)",DP.FullName().c_str(), 4);
    }
    return true;
 }
@@ -262,13 +300,14 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
 // PM::ConfigureAll - Run the all out configuration                    /*{{{*/
 // ---------------------------------------------------------------------
 /* This configures every package. It is assumed they are all unpacked and
-   that the final configuration is valid. */
+   that the final configuration is valid. This is also used to catch packages
+   that have not been configured when using ImmConfigureAll */
 bool pkgPackageManager::ConfigureAll()
 {
    pkgOrderList OList(&Cache);
    
    // Populate the order list
-   for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
+   for (pkgOrderList::iterator I = List->begin(); I != List->end(); ++I)
       if (List->IsFlag(pkgCache::PkgIterator(Cache,*I),
                       pkgOrderList::UnPacked) == true)
         OList.push_back(*I);
@@ -280,12 +319,20 @@ bool pkgPackageManager::ConfigureAll()
    bool const ConfigurePkgs = (conf == "all");
 
    // Perform the configuring
-   for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
+   for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); ++I)
    {
       PkgIterator Pkg(Cache,*I);
+      
+      /* Check if the package has been configured, this can happen if SmartConfigure
+         calls its self */ 
+      if (List->IsFlag(Pkg,pkgOrderList::Configured)) continue;
 
-      if (ConfigurePkgs == true && VerifyAndConfigure(Pkg,OList) == false) {
-         _error->Error("Internal error, packages left unconfigured. %s",Pkg.Name());
+      if (ConfigurePkgs == true && SmartConfigure(Pkg, 0) == false) {
+         if (ImmConfigureAll)
+            _error->Error(_("Could not perform immediate configuration on '%s'. "
+                       "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),1);
+         else
+            _error->Error("Internal error, packages left unconfigured. %s",Pkg.FullName().c_str());
         return false;
       }
       
@@ -295,246 +342,292 @@ bool pkgPackageManager::ConfigureAll()
    return true;
 }
                                                                        /*}}}*/
-// PM::SmartConfigure - Perform immediate configuration of the pkg     /*{{{*/
-// ---------------------------------------------------------------------
-/* This routine scheduals the configuration of the given package and all
-   of it's dependents. */
-bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
+// PM::NonLoopingSmart - helper to avoid loops while calling Smart methods /*{{{*/
+// -----------------------------------------------------------------------
+/* ensures that a loop of the form A depends B, B depends A (and similar)
+   is not leading us down into infinite recursion segfault land */
+bool pkgPackageManager::NonLoopingSmart(SmartAction const action, pkgCache::PkgIterator &Pkg,
+      pkgCache::PkgIterator DepPkg, int const Depth, bool const PkgLoop,
+      bool * const Bad, bool * const Changed)
 {
-   if (Debug == true)
-      clog << "SmartConfigure " << Pkg.Name() << endl;
-
-   pkgOrderList OList(&Cache);
+   if (PkgLoop == false)
+      List->Flag(Pkg,pkgOrderList::Loop);
+   bool success = false;
+   switch(action)
+   {
+      case UNPACK_IMMEDIATE: success = SmartUnPack(DepPkg, true, Depth + 1); break;
+      case UNPACK: success = SmartUnPack(DepPkg, false, Depth + 1); break;
+      case CONFIGURE: success = SmartConfigure(DepPkg, Depth + 1); break;
+   }
+   if (PkgLoop == false)
+      List->RmFlag(Pkg,pkgOrderList::Loop);
 
-   if (DepAdd(OList,Pkg) == false)
+   if (success == false)
       return false;
 
-   static std::string const conf = _config->Find("PackageManager::Configure","all");
-   static bool const ConfigurePkgs = (conf == "all" || conf == "smart");
-
-   if (ConfigurePkgs == true)
-      if (OList.OrderConfigure() == false)
-        return false;
+   if (Bad != NULL)
+      *Bad = false;
+   if (Changed != NULL && List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
+      *Changed = true;
+   return true;
+}
+                                                                       /*}}}*/
+// PM::SmartConfigure - Perform immediate configuration of the pkg     /*{{{*/
+// ---------------------------------------------------------------------
+/* This function tries to put the system in a state where Pkg can be configured.
+   This involves checking each of Pkg's dependencies and unpacking and
+   configuring packages where needed. */
+bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
+{
+   // If this is true, only check and correct and dependencies without the Loop flag
+   bool const PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
 
-   // Perform the configuring
-   for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
-   {
-      PkgIterator Pkg(Cache,*I);
-      
-      if (ConfigurePkgs == true && VerifyAndConfigure(Pkg,OList) == false)
-        return false;
-      
-      List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
+   if (Debug) {
+      VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
+      clog << OutputInDepth(Depth) << "SmartConfigure " << Pkg.FullName() << " (" << InstallVer.VerStr() << ")";
+      if (PkgLoop)
+        clog << " (Only Correct Dependencies)";
+      clog << endl;
    }
 
-   if (Cache[Pkg].InstVerIter(Cache)->MultiArch == pkgCache::Version::Same)
-      for (PkgIterator P = Pkg.Group().PackageList();
-          P.end() == false; P = Pkg.Group().NextPkg(P))
+   VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
+
+   /* Because of the ordered list, most dependencies should be unpacked,
+      however if there is a loop (A depends on B, B depends on A) this will not
+      be the case, so check for dependencies before configuring. */
+   bool Bad = false, Changed = false;
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
+   unsigned int i=0;
+   std::list<DepIterator> needConfigure;
+   do
+   {
+      // Check each dependency and see if anything needs to be done
+      // so that it can be configured
+      Changed = false;
+      for (DepIterator D = instVer.DependsList(); D.end() == false; )
       {
-        if (Pkg == P || List->IsFlag(P,pkgOrderList::Configured) == true ||
-            Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
-             (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
+        // Compute a single dependency element (glob or)
+        pkgCache::DepIterator Start, End;
+        D.GlobOr(Start,End);
+
+        if (End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::PreDepends)
            continue;
-        SmartConfigure(P);
-      }
+        Bad = true;
 
-   // Sanity Check
-   if (List->IsFlag(Pkg,pkgOrderList::Configured) == false && Debug)
-      _error->Error(_("Could not perform immediate configuration on '%s'. "
-                       "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1);
+         // the first pass checks if we its all good, i.e. if we have
+         // to do anything at all
+        for (DepIterator Cur = Start; true; ++Cur)
+        {
+           std::unique_ptr<Version *[]> VList(Cur.AllTargets());
 
-   return true;
-}
+           for (Version **I = VList.get(); *I != 0; ++I)
+           {
+              VerIterator Ver(Cache,*I);
+              PkgIterator DepPkg = Ver.ParentPkg();
 
-// PM::VerifyConfigure - Check configuration of dependancies     /*{{{*/
-// ---------------------------------------------------------------------
-/* This routine checks that all a packages dependancies have been 
-   configured, before it is going to be configured. If this gives a warning 
-   on a virtual package, it means that the package thats providing it is not
-   configured*/
-bool pkgPackageManager::VerifyConfigure(PkgIterator Pkg, pkgOrderList &OList)
-{
-   // If this is true at the end, then the package should not be configured
-   bool error=true;
-   // This holds the the OR status of the previous dependancy  
-   bool previousOr=false;
+              // Check if the current version of the package is available and will satisfy this dependency
+              if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true &&
+                  List->IsFlag(DepPkg,pkgOrderList::Removed) == false &&
+                  DepPkg.State() == PkgIterator::NeedsNothing &&
+                  (Cache[DepPkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
+              {
+                 Bad = false;
+                 break;
+              }
 
-   // First iterate through the dependancies of Pkg
-   for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); D.end() == false; D++)
-   {
-      
-      /* If the dependancy is of type Depends or PreDepends, we need to check it, but only if it is going to be 
-         configured at some point */
-      if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) {
-         
-         /* If the previous package and this package are OR dependancies, and the previous package satisfied the dependancy
-            then skip this dependancy as it is not relevent, this will repeat for the next package if the situation is the 
-            same */
-         if (previousOr && !error) { // As error has not been reset, this refers to the previous dependancy 
-            previousOr = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;
+              // Check if the version that is going to be installed will satisfy the dependency
+              if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false)
+                 continue;
+
+              if (PkgLoop == true)
+              {
+                 if (Debug)
+                    std::clog << OutputInDepth(Depth) << "Package " << APT::PrettyPkg(&Cache, Pkg) << " loops in SmartConfigure";
+                 if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
+                    Bad = false;
+                 else if (Debug)
+                    std::clog << ", but it isn't unpacked yet";
+                 if (Debug)
+                    std::clog << std::endl;
+              }
+           }
+
+            if (Cur == End || Bad == false)
+              break;
+         }
+
+         // this dependency is in a good state, so we can stop
+         if (Bad == false)
+         {
+            if (Debug)
+               std::clog << OutputInDepth(Depth) << "Found ok dep " << APT::PrettyPkg(&Cache, Start.TargetPkg()) << std::endl;
             continue;
          }
-        
-         // Reset error
-         error = true;
 
-         // Check thorugh all possible versions of this dependancy (D)
-         SPtrArray<Version *> VList = D.AllTargets();
-        for (Version **I = VList; *I != 0; I++)
+        // Check for dependencies that have not been unpacked, 
+         // probably due to loops.
+        for (DepIterator Cur = Start; true; ++Cur)
         {
-           VerIterator DepVer(Cache,*I);
-           PkgIterator DepPkg = DepVer.ParentPkg();
-           VerIterator DepInstallVer(Cache,Cache[DepPkg].InstallVer);
-           
-           if (DepPkg.CurrentVer() == DepVer && !List->IsFlag(DepPkg,pkgOrderList::UnPacked)) {
-              error=false;
+           std::unique_ptr<Version *[]> VList(Cur.AllTargets());
+
+           for (Version **I = VList.get(); *I != 0; ++I)
+           {
+              VerIterator Ver(Cache,*I);
+              PkgIterator DepPkg = Ver.ParentPkg();
+
+              // Check if the current version of the package is available and will satisfy this dependency
+              if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true &&
+                  List->IsFlag(DepPkg,pkgOrderList::Removed) == false &&
+                  DepPkg.State() == PkgIterator::NeedsNothing &&
+                  (Cache[DepPkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
+                  continue;
+
+              // Check if the version that is going to be installed will satisfy the dependency
+              if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false)
+                 continue;
+
+              if (PkgLoop == true)
+              {
+                 if (Debug)
+                    std::clog << OutputInDepth(Depth) << "Package " << APT::PrettyPkg(&Cache, Pkg) << " loops in SmartConfigure";
+                 if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
+                    Bad = false;
+                 else if (Debug)
+                    std::clog << ", but it isn't unpacked yet";
+                 if (Debug)
+                    std::clog << std::endl;
+              }
+              else
+              {
+                 if (Debug)
+                    clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << APT::PrettyDep(&Cache, Cur) << endl;
+                 if (NonLoopingSmart(UNPACK_IMMEDIATE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
+                    return false;
+              }
+               // at this point we either unpacked a Dep or we are in a loop,
+               // no need to unpack a second one
               break;
            }
-           
-           if (Cache[DepPkg].InstallVer == DepVer && 
-              (List->IsFlag(DepPkg,pkgOrderList::Configured) || OList.IsFlag(DepPkg,pkgOrderList::InList))) {
-              error=false;
+
+           if (Cur == End || Bad == false)
               break;
-           }
         }
 
-         /* Only worry here if this package is a OR with the next, as even though this package does not satisfy the OR
-            the next one might */
-         if (error && !((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or)) {
-             _error->Error("Package %s should not be configured because package %s is not configured",Pkg.Name(),D.TargetPkg().Name());
-             return false; 
-         /* If the previous package is a OR but not this package, but there is still an error then fail as it will not
-            be satisfied */    
-         } else if (error && previousOr && !((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or)) {
-             _error->Error("Package %s should not be configured because package %s (or any alternatives) are not configured",Pkg.Name(),D.TargetPkg().Name());
-             return false; 
-         }
-         
-         previousOr = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;
-      } else {
-         previousOr=false;
-      }
-   }
-   return true;
-}
-
-// PM::VerifyAndConfigure - Check configuration of dependancies     /*{{{*/
-// ---------------------------------------------------------------------
-/* This routine verifies if a package can be configured and if so 
-   configures it  */
-bool pkgPackageManager::VerifyAndConfigure(PkgIterator Pkg, pkgOrderList &OList)
-{
-   if (VerifyConfigure(Pkg, OList)) 
-      return Configure(Pkg);
-   else
-      return false;
-   
-}
-                                                                       /*}}}*/
-// PM::DepAdd - Add all dependents to the oder list                    /*{{{*/
-// ---------------------------------------------------------------------
-/* This recursively adds all dependents to the order list */
-bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
-{
-   if (OList.IsFlag(Pkg,pkgOrderList::Added) == true)
-      return true;
-   if (List->IsFlag(Pkg,pkgOrderList::Configured) == true)
-      return true;
-   if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
-      return false;
+        if (Bad == false)
+           continue;
 
-   if (Debug) 
-      std::clog << OutputInDepth(Depth) << "DepAdd: " << Pkg.Name() << std::endl;
-      
-   // Put the package on the list
-   OList.push_back(Pkg);
-   OList.Flag(Pkg,pkgOrderList::Added);
-   Depth++;
+        needConfigure.push_back(Start);
+      }
+      if (i++ > max_loops)
+         return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (1) for %s, aborting", Pkg.FullName().c_str());
+   } while (Changed == true);
 
-   // Check the dependencies to see if they are all satisfied.
-   bool Bad = false;
-   for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); D.end() == false;)
+   // now go over anything that needs configuring
+   Bad = false, Changed = false, i = 0;
+   do
    {
-      if (D->Type != pkgCache::Dep::Depends && D->Type != pkgCache::Dep::PreDepends)
+      Changed = false;
+      for (std::list<DepIterator>::const_iterator D = needConfigure.begin(); D != needConfigure.end(); ++D)
       {
-        D++;
-        continue;
-      }
-      
-      // Grok or groups
-      Bad = true;
-      for (bool LastOR = true; D.end() == false && LastOR == true; D++)
-      {
-        LastOR = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;
-        
-        if (Bad == false)
+        // Compute a single dependency element (glob or) without modifying D
+        pkgCache::DepIterator Start, End;
+        {
+           pkgCache::DepIterator Discard = *D;
+           Discard.GlobOr(Start,End);
+        }
+
+        if (End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::PreDepends)
            continue;
+        Bad = true;
 
-        SPtrArray<Version *> VList = D.AllTargets();
-        for (Version **I = VList; *I != 0 && Bad == true; I++)
+        // Search for dependencies which are unpacked but aren't configured yet (maybe loops)
+        for (DepIterator Cur = Start; true; ++Cur)
         {
-           VerIterator Ver(Cache,*I);
-           PkgIterator Pkg = Ver.ParentPkg();
-           VerIterator InstallVer(Cache,Cache[Pkg].InstallVer);
-           VerIterator CandVer(Cache,Cache[Pkg].CandidateVer);
-           
-           if (Debug && false) {
-              if (Ver==0) {
-                 cout << OutputInDepth(Depth) << "Checking if " << Ver << " of " << Pkg.Name() << " satisfies this dependancy" << endl;
-              } else {
-                 cout << OutputInDepth(Depth) << "Checking if " << Ver.VerStr() << " of " << Pkg.Name() << " satisfies this dependancy" << endl;
-               }
-
-               if (Pkg.CurrentVer()==0) {
-                  cout << OutputInDepth(Depth) << "  CurrentVer " << Pkg.CurrentVer() << " IsNow " << List->IsNow(Pkg) << " NeedsNothing " << (Pkg.State() == PkgIterator::NeedsNothing) << endl;
-               } else { 
-                  cout << OutputInDepth(Depth) << "  CurrentVer " << Pkg.CurrentVer().VerStr() << " IsNow " << List->IsNow(Pkg) << " NeedsNothing " << (Pkg.State() == PkgIterator::NeedsNothing) << endl;
-               }
-
-               if (InstallVer==0) {
-                  cout << OutputInDepth(Depth )<< "  InstallVer " << InstallVer << endl;
-               } else { 
-                  cout << OutputInDepth(Depth )<< "  InstallVer " << InstallVer.VerStr() << endl; 
-               }
-               if (CandVer != 0)
-                  cout << OutputInDepth(Depth ) << "  CandVer " << CandVer.VerStr() << endl; 
-
-               cout << OutputInDepth(Depth) << "  Keep " << Cache[Pkg].Keep() << " Unpacked " << List->IsFlag(Pkg,pkgOrderList::UnPacked) << " Configured " << List->IsFlag(Pkg,pkgOrderList::Configured) << endl;
-               
-            }
-           // See if the current version is ok
-           if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true && 
-               Pkg.State() == PkgIterator::NeedsNothing)
+           std::unique_ptr<Version *[]> VList(Cur.AllTargets());
+
+           for (Version **I = VList.get(); *I != 0; ++I)
            {
-              Bad = false;
-              continue;
+              VerIterator Ver(Cache,*I);
+              PkgIterator DepPkg = Ver.ParentPkg();
+
+              // Check if the version that is going to be installed will satisfy the dependency
+              if (Cache[DepPkg].InstallVer != *I)
+                 continue;
+
+              if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
+              {
+                 if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop)
+                 {
+                   // This dependency has already been dealt with by another SmartConfigure on Pkg
+                   Bad = false;
+                   break;
+                 }
+                 if (Debug)
+                    std::clog << OutputInDepth(Depth) << "Configure already unpacked " << APT::PrettyPkg(&Cache, DepPkg) << std::endl;
+                 if (NonLoopingSmart(CONFIGURE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
+                    return false;
+                 break;
+
+              }
+              else if (List->IsFlag(DepPkg,pkgOrderList::Configured))
+              {
+                 Bad = false;
+                 break;
+              }
            }
-           
-           // Not the install version 
-           if ((Cache[Pkg].InstallVer != *I && Cache[Pkg].CandidateVer != *I) || 
-               (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing && 
-               (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
-              continue;
-           
-           if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == true)
-              Bad = !DepAdd(OList,Pkg,Depth);
-           if (List->IsFlag(Pkg,pkgOrderList::Configured) == true)
-              Bad = false;
-        }
+           if (Cur == End || Bad == false)
+              break;
+         }
+
+
+        if (Bad == true && Changed == false && Debug == true)
+           std::clog << OutputInDepth(Depth) << "Could not satisfy " << APT::PrettyDep(&Cache, *D) << std::endl;
       }
-      
-      if (Bad == true)
+      if (i++ > max_loops)
+         return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (2) for %s, aborting", Pkg.FullName().c_str());
+   } while (Changed == true);
+
+   if (Bad == true)
+      return _error->Error(_("Could not configure '%s'. "),Pkg.FullName().c_str());
+
+   // Check for reverse conflicts.
+   if (CheckRBreaks(Pkg,Pkg.RevDependsList(), instVer.VerStr()) == false)
+      return false;
+
+   for (PrvIterator P = instVer.ProvidesList(); P.end() == false; ++P)
+      if (Pkg->Group != P.OwnerPkg()->Group)
+        CheckRBreaks(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
+
+   if (PkgLoop) return true;
+
+   static std::string const conf = _config->Find("PackageManager::Configure","all");
+   static bool const ConfigurePkgs = (conf == "all" || conf == "smart");
+
+   if (List->IsFlag(Pkg,pkgOrderList::Configured))
+      return _error->Error("Internal configure error on '%s'.", Pkg.FullName().c_str());
+
+   if (ConfigurePkgs == true && Configure(Pkg) == false)
+      return false;
+
+   List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
+
+   if ((Cache[Pkg].InstVerIter(Cache)->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
+      for (PkgIterator P = Pkg.Group().PackageList();
+          P.end() == false; P = Pkg.Group().NextPkg(P))
       {
-        if (Debug) 
-           std::clog << OutputInDepth(Depth) << "DepAdd FAILS on: " << Pkg.Name() << std::endl;
-        OList.Flag(Pkg,0,pkgOrderList::Added);
-        OList.pop_back();
-        Depth--;
-        return false;
+        if (Pkg == P || List->IsFlag(P,pkgOrderList::Configured) == true ||
+            List->IsFlag(P,pkgOrderList::UnPacked) == false ||
+            Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
+             (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
+           continue;
+        if (SmartConfigure(P, (Depth +1)) == false)
+           return false;
       }
-   }
-   
-   Depth--;
+
+   // Sanity Check
+   if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
+      return _error->Error(_("Could not configure '%s'. "),Pkg.FullName().c_str());
+
    return true;
 }
                                                                        /*}}}*/
@@ -542,31 +635,41 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
 // ---------------------------------------------------------------------
 /* This is called to deal with conflicts arising from unpacking */
 bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
+{
+   return EarlyRemove(Pkg, NULL);
+}
+bool pkgPackageManager::EarlyRemove(PkgIterator Pkg, DepIterator const * const Dep)
 {
    if (List->IsNow(Pkg) == false)
       return true;
-        
+
    // Already removed it
    if (List->IsFlag(Pkg,pkgOrderList::Removed) == true)
       return true;
-   
+
    // Woops, it will not be re-installed!
    if (List->IsFlag(Pkg,pkgOrderList::InList) == false)
       return false;
 
+   // these breaks on M-A:same packages can be dealt with. They 'loop' by design
+   if (Dep != NULL && (*Dep)->Type == pkgCache::Dep::DpkgBreaks && Dep->IsMultiArchImplicit() == true)
+      return true;
+
    // Essential packages get special treatment
    bool IsEssential = false;
-   if ((Pkg->Flags & pkgCache::Flag::Essential) != 0)
+   if ((Pkg->Flags & pkgCache::Flag::Essential) != 0 ||
+       (Pkg->Flags & pkgCache::Flag::Important) != 0)
       IsEssential = true;
 
-   /* Check for packages that are the dependents of essential packages and 
+   /* Check for packages that are the dependents of essential packages and
       promote them too */
    if (Pkg->CurrentVer != 0)
    {
-      for (DepIterator D = Pkg.RevDependsList(); D.end() == false &&
-          IsEssential == false; D++)
+      for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false &&
+          IsEssential == false; ++D)
         if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
-           if ((D.ParentPkg()->Flags & pkgCache::Flag::Essential) != 0)
+           if ((D.ParentPkg()->Flags & pkgCache::Flag::Essential) != 0 ||
+               (D.ParentPkg()->Flags & pkgCache::Flag::Important) != 0)
               IsEssential = true;
    }
 
@@ -577,13 +680,16 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
                                "removing the essential package %s due to a "
                                "Conflicts/Pre-Depends loop. This is often bad, "
                                "but if you really want to do it, activate the "
-                               "APT::Force-LoopBreak option."),Pkg.Name());
+                               "APT::Force-LoopBreak option."),Pkg.FullName().c_str());
    }
-   
+   // dpkg will auto-deconfigure it, no need for the big remove hammer
+   else if (Dep != NULL && (*Dep)->Type == pkgCache::Dep::DpkgBreaks)
+      return true;
+
    bool Res = SmartRemove(Pkg);
    if (Cache[Pkg].Delete() == false)
       List->Flag(Pkg,pkgOrderList::Removed,pkgOrderList::States);
-   
+
    return Res;
 }
                                                                        /*}}}*/
@@ -598,354 +704,322 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
 
    return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);
-   return true;
 }
                                                                        /*}}}*/
 // PM::SmartUnPack - Install helper                                    /*{{{*/
 // ---------------------------------------------------------------------
-/* This performs the task of handling pre-depends. */
+/* This puts the system in a state where it can Unpack Pkg, if Pkg is already
+   unpacked, or when it has been unpacked, if Immediate==true it configures it. */
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 {
-   return SmartUnPack(Pkg, true);
+   return SmartUnPack(Pkg, true, 0);
 }
-bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
+bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth)
 {
-   if (Debug == true)
-      clog << "SmartUnPack " << Pkg.Name() << endl;
+   bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
 
-   // Check if it is already unpacked
-   if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
-       Cache[Pkg].Keep() == true)
-   {
-      List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
-      if (Immediate == true &&
-         List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
-        if (SmartConfigure(Pkg) == false)
-           _error->Warning(_("Could not perform immediate configuration on already unpacked '%s'. "
-                       "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name());
-      return true;
+   if (Debug) {
+      clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.FullName();
+      VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
+      if (Pkg.CurrentVer() == 0)
+        clog << " (install version " << InstallVer.VerStr() << ")";
+      else
+        clog << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")";
+      if (PkgLoop)
+        clog << " (Only Perform PreUnpack Checks)";
+      if (Immediate)
+        clog << " immediately";
+      clog << endl;
    }
-   
+
    VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
 
-   /* See if this packages install version has any predependencies
-      that are not met by 'now' packages. */
-   for (DepIterator D = instVer.DependsList();
-       D.end() == false; )
+   /* PreUnpack Checks: This loop checks and attempts to rectify any problems that would prevent the package being unpacked.
+      It addresses: PreDepends, Conflicts, Obsoletes and Breaks (DpkgBreaks). Any resolutions that do not require it should
+      avoid configuration (calling SmartUnpack with Immediate=true), this is because when unpacking some packages with
+      complex dependency structures, trying to configure some packages while breaking the loops can complicate things.
+      This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
+      or by the ConfigureAll call at the end of the for loop in OrderInstall. */
+   bool SomethingBad = false, Changed = false;
+   bool couldBeTemporaryRemoved = Depth != 0 && List->IsFlag(Pkg,pkgOrderList::Removed) == false;
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
+   unsigned int i = 0;
+   do 
    {
-      // Compute a single dependency element (glob or)
-      pkgCache::DepIterator Start;
-      pkgCache::DepIterator End;
-      D.GlobOr(Start,End);
-      
-      while (End->Type == pkgCache::Dep::PreDepends)
+      Changed = false;
+      for (DepIterator D = instVer.DependsList(); D.end() == false; )
       {
-        if (Debug)
-           clog << "PreDepends order for " << Pkg.Name() << std::endl;
+        // Compute a single dependency element (glob or)
+        pkgCache::DepIterator Start, End;
+        D.GlobOr(Start,End);
 
-        // Look for possible ok targets.
-        SPtrArray<Version *> VList = Start.AllTargets();
-        bool Bad = true;
-        for (Version **I = VList; *I != 0 && Bad == true; I++)
-        {
-           VerIterator Ver(Cache,*I);
-           PkgIterator Pkg = Ver.ParentPkg();
-           
-           // See if the current version is ok
-           if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true && 
-               Pkg.State() == PkgIterator::NeedsNothing)
+        if (End->Type == pkgCache::Dep::PreDepends)
+         {
+           bool Bad = true;
+           if (Debug)
+              clog << OutputInDepth(Depth) << "PreDepends order for " << Pkg.FullName() << std::endl;
+
+           // Look for easy targets: packages that are already okay
+           for (DepIterator Cur = Start; Bad == true; ++Cur)
            {
-              Bad = false;
-              if (Debug)
-                 clog << "Found ok package " << Pkg.Name() << endl;
-              continue;
-           }
-        }
-        
-        // Look for something that could be configured.
-        for (Version **I = VList; *I != 0 && Bad == true; I++)
-        {
-           VerIterator Ver(Cache,*I);
-           PkgIterator Pkg = Ver.ParentPkg();
-           
-           // Not the install version 
-           if (Cache[Pkg].InstallVer != *I || 
-               (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
-              continue;
+              std::unique_ptr<Version *[]> VList(Cur.AllTargets());
+              for (Version **I = VList.get(); *I != 0; ++I)
+              {
+                 VerIterator Ver(Cache,*I);
+                 PkgIterator Pkg = Ver.ParentPkg();
 
-           if (Debug)
-              clog << "Trying to SmartConfigure " << Pkg.Name() << endl;
-           Bad = !SmartConfigure(Pkg);
-        }
+                 // See if the current version is ok
+                 if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true &&
+                     Pkg.State() == PkgIterator::NeedsNothing &&
+                     (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
+                 {
+                    Bad = false;
+                    if (Debug)
+                       clog << OutputInDepth(Depth) << "Found ok package " << Pkg.FullName() << endl;
+                    break;
+                 }
+              }
+              if (Cur == End)
+                 break;
+           }
 
-        /* If this or element did not match then continue on to the
-           next or element until a matching element is found */
-        if (Bad == true)
-        {
-           // This triggers if someone make a pre-depends/depend loop.
-           if (Start == End)
-              return _error->Error("Couldn't configure pre-depend %s for %s, "
-                                   "probably a dependency cycle.",
-                                   End.TargetPkg().Name(),Pkg.Name());
-           Start++;
-        }
-        else 
-           break;
-      }
-      
-      if (End->Type == pkgCache::Dep::Conflicts || 
-         End->Type == pkgCache::Dep::Obsoletes)
-      {
-        /* Look for conflicts. Two packages that are both in the install
-           state cannot conflict so we don't check.. */
-        SPtrArray<Version *> VList = End.AllTargets();
-        for (Version **I = VList; *I != 0; I++)
-        {
-           VerIterator Ver(Cache,*I);
-           PkgIterator ConflictPkg = Ver.ParentPkg();
-           VerIterator InstallVer(Cache,Cache[ConflictPkg].InstallVer);
-           
-           // See if the current version is conflicting
-           if (ConflictPkg.CurrentVer() == Ver && !List->IsFlag(ConflictPkg,pkgOrderList::UnPacked))
+           // Look for something that could be configured.
+           for (DepIterator Cur = Start; Bad == true && Cur.end() == false; ++Cur)
            {
-               if (Debug && false) 
-                cout << " " << Pkg.Name() << " conflicts with " << ConflictPkg.Name() << endl;
-                
-          if (Debug && false) {
-              if (Ver==0) {
-                 cout << "  Checking if " << Ver << " of " << ConflictPkg.Name() << " satisfies this dependancy" << endl;
-              } else {
-                 cout << "  Checking if " << Ver.VerStr() << " of " << ConflictPkg.Name() << " satisfies this dependancy" << endl;
-               }
-            
-               if (ConflictPkg.CurrentVer()==0) {
-                  cout << "    CurrentVer " << ConflictPkg.CurrentVer() << " IsNow " << List->IsNow(ConflictPkg) << " NeedsNothing " << (ConflictPkg.State() == PkgIterator::NeedsNothing) << endl;
-               } else { 
-                  cout << "    CurrentVer " << ConflictPkg.CurrentVer().VerStr() << " IsNow " << List->IsNow(ConflictPkg) << " NeedsNothing " << (ConflictPkg.State() == PkgIterator::NeedsNothing) << endl;
-               }
-            
-               if (InstallVer==0) {
-                  cout << "    InstallVer " << InstallVer << endl;
-               } else { 
-                  cout << "    InstallVer " << InstallVer.VerStr() << endl; 
-               }
-
-               cout << "    Keep " << Cache[ConflictPkg].Keep() << " Unpacked " << List->IsFlag(ConflictPkg,pkgOrderList::UnPacked) << " Configured " << List->IsFlag(ConflictPkg,pkgOrderList::Configured) << " Removed " << List->IsFlag(ConflictPkg,pkgOrderList::Removed) << " Loop " << List->IsFlag(ConflictPkg,pkgOrderList::Loop) << endl;
-               cout << "    Delete " << Cache[ConflictPkg].Delete() << endl;
-            }
-           
-              if (!List->IsFlag(ConflictPkg,pkgOrderList::Loop)) {
-                 if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0) {
-                      cout << "Unpacking " << ConflictPkg.Name() << " to prevent conflict" << endl;
-                     List->Flag(Pkg,pkgOrderList::Loop);
-                     SmartUnPack(ConflictPkg,false);
-                  } else {
-                      if (EarlyRemove(ConflictPkg) == false)
-                         return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name());
-                  }
-              } else {
-                 if (!List->IsFlag(ConflictPkg,pkgOrderList::Removed)) {
-                      cout << "Because of conficts knot, removing " << ConflictPkg.Name() << " to conflict violation" << endl;
-                     if (EarlyRemove(ConflictPkg) == false)
-                          return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name());
-                 }
+              std::unique_ptr<Version *[]> VList(Cur.AllTargets());
+              for (Version **I = VList.get(); *I != 0; ++I)
+              {
+                 VerIterator Ver(Cache,*I);
+                 PkgIterator DepPkg = Ver.ParentPkg();
+
+                 // Not the install version
+                 if (Cache[DepPkg].InstallVer != *I)
+                    continue;
+
+                 if (Cache[DepPkg].Keep() == true && DepPkg.State() == PkgIterator::NeedsNothing &&
+                       (Cache[DepPkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
+                    continue;
+
+                 if (List->IsFlag(DepPkg,pkgOrderList::Configured))
+                 {
+                    Bad = false;
+                    break;
+                 }
+
+                 // check if it needs unpack or if if configure is enough
+                 if (List->IsFlag(DepPkg,pkgOrderList::UnPacked) == false)
+                 {
+                    // two packages pre-depending on each other can't be handled sanely
+                    if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop)
+                    {
+                       // this isn't an error as there is potential for something else to satisfy it
+                       // (like a provides or an or-group member)
+                       if (Debug)
+                          clog << OutputInDepth(Depth) << "Unpack loop detected between " << DepPkg.FullName() << " and " << Pkg.FullName() << endl;
+                       continue;
+                    }
+
+                    if (Debug)
+                       clog << OutputInDepth(Depth) << "Trying to SmartUnpack " << DepPkg.FullName() << endl;
+                    if (NonLoopingSmart(UNPACK_IMMEDIATE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
+                       return false;
+                 }
+                 else
+                 {
+                    if (Debug)
+                       clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << DepPkg.FullName() << endl;
+                    if (NonLoopingSmart(CONFIGURE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
+                       return false;
+                 }
+                 break;
               }
            }
+
+           if (Bad == true)
+              SomethingBad = true;
         }
-      }
-      
-      // Check for breaks
-      if (End->Type == pkgCache::Dep::DpkgBreaks) {
-         SPtrArray<Version *> VList = End.AllTargets();
-        for (Version **I = VList; *I != 0; I++)
+        else if (End->Type == pkgCache::Dep::Conflicts ||
+                 End->Type == pkgCache::Dep::Obsoletes ||
+                 End->Type == pkgCache::Dep::DpkgBreaks)
         {
-           VerIterator Ver(Cache,*I);
-           PkgIterator BrokenPkg = Ver.ParentPkg();
-           VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
-           
-           cout << "  " << Pkg.Name() << " breaks " << BrokenPkg.Name() << endl;
-           if (Debug && false) {
-              if (Ver==0) {
-                 cout << "  Checking if " << Ver << " of " << BrokenPkg.Name() << " satisfies this dependancy" << endl;
-              } else {
-                 cout << "  Checking if " << Ver.VerStr() << " of " << BrokenPkg.Name() << " satisfies this dependancy" << endl;
-               }
-            
-               if (BrokenPkg.CurrentVer()==0) {
-                  cout << "    CurrentVer " << BrokenPkg.CurrentVer() << " IsNow " << List->IsNow(BrokenPkg) << " NeedsNothing " << (BrokenPkg.State() == PkgIterator::NeedsNothing) << endl;
-               } else { 
-                  cout << "    CurrentVer " << BrokenPkg.CurrentVer().VerStr() << " IsNow " << List->IsNow(BrokenPkg) << " NeedsNothing " << (BrokenPkg.State() == PkgIterator::NeedsNothing) << endl;
-               }
-            
-               if (InstallVer==0) {
-                  cout << "    InstallVer " << InstallVer << endl;
-               } else { 
-                  cout << "    InstallVer " << InstallVer.VerStr() << endl; 
-               }
-
-               cout << "    Keep " << Cache[BrokenPkg].Keep() << " Unpacked " << List->IsFlag(BrokenPkg,pkgOrderList::UnPacked) << " Configured " << List->IsFlag(BrokenPkg,pkgOrderList::Configured) << " Removed " << List->IsFlag(BrokenPkg,pkgOrderList::Removed) << " Loop " << List->IsFlag(BrokenPkg,pkgOrderList::Loop) << " InList " << List->IsFlag(BrokenPkg,pkgOrderList::InList) << endl;
-               cout << "    Delete " << Cache[BrokenPkg].Delete() << endl;
-            }
-           // Check if it needs to be unpacked
-           if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == false && 
-               !List->IsFlag(BrokenPkg,pkgOrderList::Loop) && List->IsNow(BrokenPkg)) {
-              List->Flag(Pkg,pkgOrderList::Loop);
-             // Found a break, so unpack the package
-             if (Debug) 
-                cout << "  Unpacking " << BrokenPkg.Name() << " to avoid break" << endl;
-             SmartUnPack(BrokenPkg, false);
-           }
-           // Check if a package needs to be removed
-           if (Cache[BrokenPkg].Delete() == true && !List->IsFlag(BrokenPkg,pkgOrderList::Configured)) {
-             if (Debug) 
-                cout << "  Removing " << BrokenPkg.Name() << " to avoid break" << endl;
-             SmartRemove(BrokenPkg);
+           std::unique_ptr<Version *[]> VList(End.AllTargets());
+           for (Version **I = VList.get(); *I != 0; ++I)
+           {
+              VerIterator Ver(Cache,*I);
+              PkgIterator ConflictPkg = Ver.ParentPkg();
+              if (ConflictPkg.CurrentVer() != Ver)
+              {
+                 if (Debug)
+                    std::clog << OutputInDepth(Depth) << "Ignore not-installed version " << Ver.VerStr() << " of " << ConflictPkg.FullName() << " for " << APT::PrettyDep(&Cache, End) << std::endl;
+                 continue;
+              }
+
+              if (List->IsNow(ConflictPkg) == false)
+              {
+                 if (Debug)
+                    std::clog << OutputInDepth(Depth) << "Ignore already dealt-with version " << Ver.VerStr() << " of " << ConflictPkg.FullName() << " for " << APT::PrettyDep(&Cache, End) << std::endl;
+                 continue;
+              }
+
+              if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == true)
+              {
+                 if (Debug)
+                    clog << OutputInDepth(Depth) << "Ignoring " << APT::PrettyDep(&Cache, End) << " as " << ConflictPkg.FullName() << "was temporarily removed" << endl;
+                 continue;
+              }
+
+              if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) && PkgLoop)
+              {
+                 if (End->Type == pkgCache::Dep::DpkgBreaks && End.IsMultiArchImplicit() == true)
+                 {
+                    if (Debug)
+                       clog << OutputInDepth(Depth) << "Because dependency is MultiArchImplicit we ignored looping on: " << APT::PrettyPkg(&Cache, ConflictPkg) << endl;
+                    continue;
+                 }
+                 if (Debug)
+                 {
+                    if (End->Type == pkgCache::Dep::DpkgBreaks)
+                       clog << OutputInDepth(Depth) << "Because of breaks knot, deconfigure " << ConflictPkg.FullName() << " temporarily" << endl;
+                    else
+                       clog << OutputInDepth(Depth) << "Because of conflict knot, removing " << ConflictPkg.FullName() << " temporarily" << endl;
+                 }
+                 if (EarlyRemove(ConflictPkg, &End) == false)
+                    return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 3);
+                 SomethingBad = true;
+                 continue;
+              }
+
+              if (Cache[ConflictPkg].Delete() == false)
+              {
+                 if (Debug)
+                 {
+                    clog << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.FullName() << " to avoid " << APT::PrettyDep(&Cache, End);
+                    if (PkgLoop == true)
+                       clog << " (Looping)";
+                    clog << std::endl;
+                 }
+                 // we would like to avoid temporary removals and all that at best via a simple unpack
+                 _error->PushToStack();
+                 if (NonLoopingSmart(UNPACK, Pkg, ConflictPkg, Depth, PkgLoop, NULL, &Changed) == false)
+                 {
+                    // but if it fails ignore this failure and look for alternative ways of solving
+                    if (Debug)
+                    {
+                       clog << OutputInDepth(Depth) << "Avoidance unpack of " << ConflictPkg.FullName() << " failed for " << APT::PrettyDep(&Cache, End) << " ignoring:" << std::endl;
+                       _error->DumpErrors(std::clog, GlobalError::DEBUG, false);
+                    }
+                    _error->RevertToStack();
+                    // ignorance can only happen if a) one of the offenders is already gone
+                    if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == true)
+                    {
+                       if (Debug)
+                          clog << OutputInDepth(Depth) << "But " << ConflictPkg.FullName() << " was temporarily removed in the meantime to satisfy " << APT::PrettyDep(&Cache, End) << endl;
+                    }
+                    else if (List->IsFlag(Pkg,pkgOrderList::Removed) == true)
+                    {
+                       if (Debug)
+                          clog << OutputInDepth(Depth) << "But " << Pkg.FullName() << " was temporarily removed in the meantime to satisfy " <<  APT::PrettyDep(&Cache, End) << endl;
+                    }
+                    // or b) we can make one go (removal or dpkg auto-deconfigure)
+                    else
+                    {
+                       if (Debug)
+                          clog << OutputInDepth(Depth) << "So temprorary remove/deconfigure " << ConflictPkg.FullName() << " to satisfy " <<  APT::PrettyDep(&Cache, End) << endl;
+                       if (EarlyRemove(ConflictPkg, &End) == false)
+                          return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 2);
+                    }
+                 }
+                 else
+                    _error->MergeWithStack();
+              }
+              else
+              {
+                 if (Debug)
+                    clog << OutputInDepth(Depth) << "Removing " << ConflictPkg.FullName() << " now to avoid " << APT::PrettyDep(&Cache, End) << endl;
+                 // no earlyremove() here as user has already agreed to the permanent removal
+                 if (SmartRemove(Pkg) == false)
+                    return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 1);
+              }
            }
         }
       }
+      if (i++ > max_loops)
+         return _error->Error("Internal error: APT::pkgPackageManager::MaxLoopCount reached in SmartConfigure for %s, aborting", Pkg.FullName().c_str());
+   } while (Changed == true);
+
+   if (SomethingBad == true)
+      return _error->Error("Couldn't configure %s, probably a dependency cycle.", Pkg.FullName().c_str());
+
+   if (couldBeTemporaryRemoved == true && List->IsFlag(Pkg,pkgOrderList::Removed) == true)
+   {
+      if (Debug)
+        std::clog << OutputInDepth(Depth) << "Prevent unpack as " << APT::PrettyPkg(&Cache, Pkg) << " is currently temporarily removed" << std::endl;
+      return true;
    }
-   
-   // FIXME: Crude but effective fix, allows the SmartUnPack method to be used for packages that new to the system
-   if (instVer != 0) {
-     //cout << "Check for reverse conflicts on " << Pkg.Name() << " " << instVer.VerStr() << endl;
-   
-     // Check for reverse conflicts.
-     if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
+
+   // Check for reverse conflicts.
+   if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
                   instVer.VerStr()) == false)
-        return false;
-   
-     for (PrvIterator P = instVer.ProvidesList();
-         P.end() == false; P++)
-        CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
-
-     List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
-
-     if (instVer->MultiArch == pkgCache::Version::Same)
-        for (PkgIterator P = Pkg.Group().PackageList();
-            P.end() == false; P = Pkg.Group().NextPkg(P))
-        {
-          if (Pkg == P || List->IsFlag(P,pkgOrderList::UnPacked) == true ||
-              Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
-               (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
-             continue;
-          SmartUnPack(P, false);
-        }
-      
-   } else {
-       VerIterator InstallVer(Cache,Cache[Pkg].InstallVer);
-       //cout << "Check for reverse conflicts on " << Pkg.Name() << " " << InstallVer.VerStr() << endl;
+                         return false;
    
-       // Check for reverse conflicts.
-       if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
-                  InstallVer.VerStr()) == false)
-        return false;
-        
-      List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
-   }
+   for (PrvIterator P = instVer.ProvidesList();
+       P.end() == false; ++P)
+      if (Pkg->Group != P.OwnerPkg()->Group)
+        CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
 
-   if(Install(Pkg,FileNames[Pkg->ID]) == false)
-      return false;
+   if (PkgLoop)
+      return true;
+
+   List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
 
-   /* Because of the ordered list, most dependancies should be unpacked, 
-      however if there is a loop this is not the case, so check for dependancies before configuring.
-      This is done after the package installation as it makes it easier to deal with conflicts problems */
-   bool Bad = true;
-   for (DepIterator D = instVer.DependsList();
-       D.end() == false; )
+   if (Immediate == true && (instVer->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
    {
-      // Compute a single dependency element (glob or)
-      pkgCache::DepIterator Start;
-      pkgCache::DepIterator End;
-      D.GlobOr(Start,End);
-      
-      if (End->Type == pkgCache::Dep::Depends) 
-          Bad = true;
-
-      // Check for dependanices that have not been unpacked, probably due to loops.
-      while (End->Type == pkgCache::Dep::Depends) {
-         PkgIterator DepPkg;
-         VerIterator InstallVer;
-         SPtrArray<Version *> VList = Start.AllTargets();
-         
-        for (Version **I = VList; *I != 0; I++) {
-           VerIterator Ver(Cache,*I);
-           DepPkg = Ver.ParentPkg();
-           
-           if (!Bad) continue;
-              
-           InstallVer = VerIterator(Cache,Cache[DepPkg].InstallVer);
-           VerIterator CandVer(Cache,Cache[DepPkg].CandidateVer);
-           
-           if (Debug && false) {
-              if (Ver==0) {
-                 cout << "  Checking if " << Ver << " of " << DepPkg.Name() << " satisfies this dependancy" << endl;
-              } else {
-                 cout << "  Checking if " << Ver.VerStr() << " of " << DepPkg.Name() << " satisfies this dependancy" << endl;
-               }
-            
-               if (DepPkg.CurrentVer()==0) {
-                  cout << "    CurrentVer " << DepPkg.CurrentVer() << " IsNow " << List->IsNow(DepPkg) << " NeedsNothing " << (DepPkg.State() == PkgIterator::NeedsNothing) << endl;
-               } else { 
-                  cout << "    CurrentVer " << DepPkg.CurrentVer().VerStr() << " IsNow " << List->IsNow(DepPkg) << " NeedsNothing " << (DepPkg.State() == PkgIterator::NeedsNothing) << endl;
-               }
-            
-               if (InstallVer==0) {
-                  cout << "    InstallVer " << InstallVer << endl;
-               } else { 
-                  cout << "    InstallVer " << InstallVer.VerStr() << endl; 
-               }
-               if (CandVer != 0)
-                  cout << "    CandVer " << CandVer.VerStr() << endl; 
-
-               cout << "    Keep " << Cache[DepPkg].Keep() << " Unpacked " << List->IsFlag(DepPkg,pkgOrderList::UnPacked) << " Configured " << List->IsFlag(DepPkg,pkgOrderList::Configured) << endl;
-               
-            }
-           // Check if it satisfies this dependancy
-           if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true && 
-               DepPkg.State() == PkgIterator::NeedsNothing)
-           {
-              Bad = false;
-              continue;
-           }
-           
-           if (Cache[DepPkg].InstallVer == *I && !List->IsNow(DepPkg)) {
-              Bad = false;
-              continue;
-           }
-        }
-        
-        if (InstallVer != 0 && Bad) {
-           Bad = false;
-           // Found a break, so unpack the package
-           List->Flag(Pkg,pkgOrderList::Loop);
-           if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
-              if (Debug) 
-                 cout << "  Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
-              SmartUnPack(DepPkg, false);
-           }
-        }
-        
-        if (Start==End) {
-           if (Bad && Debug) {
-              if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
-                  _error->Warning("Could not satisfy dependancies for %s",Pkg.Name());
-               } 
-           }
-           break;
-              
-        } else {
-            Start++;
-         }
+      /* Do lockstep M-A:same unpacking in two phases:
+        First unpack all installed architectures, then the not installed.
+        This way we avoid that M-A: enabled packages are installed before
+        their older non-M-A enabled packages are replaced by newer versions */
+      bool const installed = Pkg->CurrentVer != 0;
+      if (installed == true &&
+         (instVer != Pkg.CurrentVer() ||
+          ((Cache[Pkg].iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)) &&
+         Install(Pkg,FileNames[Pkg->ID]) == false)
+        return false;
+      for (PkgIterator P = Pkg.Group().PackageList();
+          P.end() == false; P = Pkg.Group().NextPkg(P))
+      {
+        if (P->CurrentVer == 0 || P == Pkg || List->IsFlag(P,pkgOrderList::UnPacked) == true ||
+            Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
+             (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
+           continue;
+        if (SmartUnPack(P, false, Depth + 1) == false)
+           return false;
+      }
+      if (installed == false && Install(Pkg,FileNames[Pkg->ID]) == false)
+        return false;
+      for (PkgIterator P = Pkg.Group().PackageList();
+          P.end() == false; P = Pkg.Group().NextPkg(P))
+      {
+        if (P->CurrentVer != 0 || P == Pkg || List->IsFlag(P,pkgOrderList::UnPacked) == true ||
+            List->IsFlag(P,pkgOrderList::Configured) == true ||
+            Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
+             (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
+           continue;
+        if (SmartUnPack(P, false, Depth + 1) == false)
+           return false;
       }
    }
-   
-   // Perform immedate configuration of the package.
-   if (Immediate == true &&
-       List->IsFlag(Pkg,pkgOrderList::Immediate) == true && !Bad)
-      if (SmartConfigure(Pkg) == false)
-        _error->Warning(_("Could not perform immediate configuration on '%s'. "
-                       "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2);
+   // packages which are already unpacked don't need to be unpacked again
+   else if ((instVer != Pkg.CurrentVer() ||
+            ((Cache[Pkg].iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)) &&
+           Install(Pkg,FileNames[Pkg->ID]) == false)
+      return false;
+
+   if (Immediate == true) {
+      // Perform immedate configuration of the package. 
+         if (SmartConfigure(Pkg, Depth + 1) == false)
+            _error->Error(_("Could not perform immediate configuration on '%s'. "
+               "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2);
+   }
    
    return true;
 }
@@ -959,10 +1033,22 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       return Failed;
 
    Reset();
-   
+
    if (Debug == true)
       clog << "Beginning to order" << endl;
 
+   std::string const planner = _config->Find("APT::Planner", "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(planner.c_str(), this, flags, nullptr);
+   if (planner != "internal")
+      return ret ? Completed : Failed;
+
    bool const ordering =
        _config->FindB("PackageManager::UnpackAll",true) ?
                List->OrderUnpack(FileNames) : List->OrderCritical();
@@ -971,33 +1057,26 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       _error->Error("Internal ordering error");
       return Failed;
    }
-   
+
    if (Debug == true)
       clog << "Done ordering" << endl;
 
    bool DoneSomething = false;
-   for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
+   for (pkgOrderList::iterator I = List->begin(); I != List->end(); ++I)
    {
       PkgIterator Pkg(Cache,*I);
-      
+
       if (List->IsNow(Pkg) == false)
       {
-         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 {
-           if (Debug == true)
-              clog << "Skipping already done " << Pkg.Name() << endl;
-        }
+        if (Debug == true)
+           clog << "Skipping already done " << Pkg.FullName() << endl;
         continue;
-        
       }
-      
+
       if (List->IsMissing(Pkg) == true)
       {
         if (Debug == true)
-           clog << "Sequence completed at " << Pkg.Name() << endl;
+           clog << "Sequence completed at " << Pkg.FullName() << endl;
         if (DoneSomething == false)
         {
            _error->Error("Internal Error, ordering was unable to handle the media swap");
@@ -1011,7 +1090,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
          Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
          (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
       {
-        _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name());
+        _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.FullName().c_str());
         return Failed;
       }
       
@@ -1022,9 +1101,16 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
            return Failed;
       }
       else
-        if (SmartUnPack(Pkg) == false)
+        if (SmartUnPack(Pkg,List->IsFlag(Pkg,pkgOrderList::Immediate),0) == false)
            return Failed;
       DoneSomething = true;
+      
+      if (ImmConfigureAll) {
+         /* ConfigureAll here to pick up and packages left unconfigured because they were unpacked in the
+            "PreUnpack Checks" section */
+         if (!ConfigureAll())
+            return Failed; 
+      }
    }
 
    // Final run through the configure phase
@@ -1032,44 +1118,66 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       return Failed;
 
    // Sanity check
-   for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
+   for (pkgOrderList::iterator I = List->begin(); I != List->end(); ++I)
    {
       if (List->IsFlag(*I,pkgOrderList::Configured) == false)
       {
         _error->Error("Internal error, packages left unconfigured. %s",
-                      PkgIterator(Cache,*I).Name());
+                      PkgIterator(Cache,*I).FullName().c_str());
         return Failed;
       }
    }
         
    return Completed;
+}
+// PM::DoInstallPostFork - compat /*{{{*/
+// ---------------------------------------------------------------------
+                                                                       /*}}}*/
+pkgPackageManager::OrderResult
+pkgPackageManager::DoInstallPostFork(int statusFd)
+{
+   APT::Progress::PackageManager *progress = new
+      APT::Progress::PackageManagerProgressFd(statusFd);
+   pkgPackageManager::OrderResult res = DoInstallPostFork(progress);
+   delete progress;
+   return res;
 }
                                                                        /*}}}*/
 // PM::DoInstallPostFork - Does install part that happens after the fork /*{{{*/
 // ---------------------------------------------------------------------
 pkgPackageManager::OrderResult 
-pkgPackageManager::DoInstallPostFork(int statusFd)
+pkgPackageManager::DoInstallPostFork(APT::Progress::PackageManager *progress)
 {
-      if(statusFd > 0)
-         // FIXME: use SetCloseExec here once it taught about throwing
-        //        exceptions instead of doing _exit(100) on failure
-        fcntl(statusFd,F_SETFD,FD_CLOEXEC); 
-      bool goResult = Go(statusFd);
-      if(goResult == false) 
-        return Failed;
-
-      return Res;
-};
-
+   bool goResult = Go(progress);
+   if(goResult == false) 
+      return Failed;
+   
+   return Res;
+}
+                                                                       /*}}}*/ 
+// PM::DoInstall - Does the installation                               /*{{{*/
+// ---------------------------------------------------------------------
+/* compat */
+pkgPackageManager::OrderResult 
+pkgPackageManager::DoInstall(int statusFd)
+{
+    APT::Progress::PackageManager *progress = new
+       APT::Progress::PackageManagerProgressFd(statusFd);
+    OrderResult res = DoInstall(progress);
+    delete progress;
+    return res;
+ }
+                                                                       /*}}}*/ 
 // PM::DoInstall - Does the installation                               /*{{{*/
 // ---------------------------------------------------------------------
 /* This uses the filenames in FileNames and the information in the
    DepCache to perform the installation of packages.*/
-pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
+pkgPackageManager::OrderResult 
+pkgPackageManager::DoInstall(APT::Progress::PackageManager *progress)
 {
    if(DoInstallPreFork() == Failed)
       return Failed;
    
-   return DoInstallPostFork(statusFd);
+   return DoInstallPostFork(progress);
 }
                                                                        /*}}}*/