]> git.saurik.com Git - apt.git/blobdiff - apt-pkg/packagemanager.cc
Added a RmFlag function to remvoe the loop flag, this should prevent any errors or...
[apt.git] / apt-pkg / packagemanager.cc
index cc9ce21c7fbbe1413f7ce54a33405ce984cc28a8..722cbfa86314d506d202d70084c0ec18a8f0052c 100644 (file)
@@ -29,6 +29,8 @@
                                                                        /*}}}*/
 using namespace std;
 
                                                                        /*}}}*/
 using namespace std;
 
+bool pkgPackageManager::SigINTStop = false;
+
 // PM::PackageManager - Constructor                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // PM::PackageManager - Constructor                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -57,7 +59,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
    if (CreateOrderList() == false)
       return false;
    
    if (CreateOrderList() == false)
       return false;
    
-   if (List->OrderUnpack() == false)
+   bool const ordering =
+       _config->FindB("PackageManager::UnpackAll",true) ?
+               List->OrderUnpack() : List->OrderCritical();
+   if (ordering == false)
       return _error->Error("Internal ordering error");
 
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
       return _error->Error("Internal ordering error");
 
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
@@ -77,7 +82,7 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
       // Skip already processed packages
       if (List->IsNow(Pkg) == false)
         continue;
       // Skip already processed packages
       if (List->IsNow(Pkg) == false)
         continue;
-        
+
       new pkgAcqArchive(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache),
                        FileNames[Pkg->ID]);
    }
       new pkgAcqArchive(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache),
                        FileNames[Pkg->ID]);
    }
@@ -122,7 +127,7 @@ bool pkgPackageManager::FixMissing()
 /* This adds the immediate flag to the pkg and recursively to the
    dependendies 
  */
 /* This adds the immediate flag to the pkg and recursively to the
    dependendies 
  */
-void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer)
+void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
 {
    DepIterator D;
    
 {
    DepIterator D;
    
@@ -143,9 +148,9 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer)
         if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))
         {
            if(Debug)
         if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))
         {
            if(Debug)
-              clog << "ImmediateAdd(): Adding Immediate flag to " << I.Name() << endl;
+              clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.Name() << endl;
            List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
            List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
-           ImmediateAdd(D.TargetPkg(), UseInstallVer);
+           ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1);
         }
       }
    return;
         }
       }
    return;
@@ -163,7 +168,11 @@ bool pkgPackageManager::CreateOrderList()
    delete List;
    List = new pkgOrderList(&Cache);
    
    delete List;
    List = new pkgOrderList(&Cache);
    
-   bool 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) 
+      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++)
    
    // Generate the list of affected packages and sort it
    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
@@ -173,19 +182,21 @@ bool pkgPackageManager::CreateOrderList()
         continue;
       
       // Mark the package and its dependends for immediate configuration
         continue;
       
       // Mark the package and its dependends for immediate configuration
-      if (((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
+      if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
           (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
           (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
-         NoImmConfigure == false)
+         NoImmConfigure == false) || ImmConfigureAll)
       {
       {
-        if(Debug)
+        if(Debug && !ImmConfigureAll)
            clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl;
         List->Flag(I,pkgOrderList::Immediate);
            clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl;
         List->Flag(I,pkgOrderList::Immediate);
-
-        // Look for other install packages to make immediate configurea
-        ImmediateAdd(I, true);
         
         
-        // And again with the current version.
-        ImmediateAdd(I, false);
+        if (!ImmConfigureAll) {
+           // Look for other install packages to make immediate configurea
+           ImmediateAdd(I, true);
+         
+           // And again with the current version.
+           ImmediateAdd(I, false);
+        }
       }
       
       // Not interesting
       }
       
       // Not interesting
@@ -253,7 +264,8 @@ 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
 // 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);
 bool pkgPackageManager::ConfigureAll()
 {
    pkgOrderList OList(&Cache);
@@ -266,14 +278,27 @@ bool pkgPackageManager::ConfigureAll()
    
    if (OList.OrderConfigure() == false)
       return false;
    
    if (OList.OrderConfigure() == false)
       return false;
-   
+
+   std::string const conf = _config->Find("PackageManager::Configure","all");
+   bool const ConfigurePkgs = (conf == "all");
+
    // Perform the configuring
    for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
    {
       PkgIterator Pkg(Cache,*I);
       
    // Perform the configuring
    for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
    {
       PkgIterator Pkg(Cache,*I);
       
-      if (Configure(Pkg) == false)
+      /* 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 && SmartConfigure(Pkg) == 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.Name(),1);
+         else
+            _error->Error("Internal error, packages left unconfigured. %s",Pkg.Name());
         return false;
         return false;
+      }
       
       List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
    }
       
       List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
    }
@@ -283,108 +308,135 @@ bool pkgPackageManager::ConfigureAll()
                                                                        /*}}}*/
 // PM::SmartConfigure - Perform immediate configuration of the pkg     /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // PM::SmartConfigure - Perform immediate configuration of the pkg     /*{{{*/
 // ---------------------------------------------------------------------
-/* This routine scheduals the configuration of the given package and all
-   of it's dependents. */
+/* This function tries to put the system in a state where Pkg can be configured.
+   This involves checking each of Pkg's dependanies and unpacking and 
+   configuring packages where needed. 
+   
+   Note on failure: This method can fail, without causing any problems. 
+   This can happen when using Immediate-Configure-All, SmartUnPack may call
+   SmartConfigure, it may fail because of a complex dependancy situation, but
+   a error will only be reported if ConfigureAll fails. This is why some of the
+   messages this function reports on failure (return false;) as just warnings
+   only shown when debuging*/
 bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
 {
 bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
 {
-   pkgOrderList OList(&Cache);
-
-   if (DepAdd(OList,Pkg) == false)
-      return false;
-   
-   if (OList.OrderConfigure() == false)
-      return false;
-   
-   // Perform the configuring
-   for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
-   {
-      PkgIterator Pkg(Cache,*I);
+   if (Debug)
+      clog << "SmartConfigure " << Pkg.Name() << endl;
       
       
-      if (Configure(Pkg) == false)
-        return false;
+   VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
       
       
-      List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
-   }
-
-   // Sanity Check
-   if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
-      return _error->Error("Internal error, could not immediate configure %s",Pkg.Name());
-   
-   return true;
-}
-                                                                       /*}}}*/
-// 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;
-      
-   // Put the package on the list
-   OList.push_back(Pkg);
-   OList.Flag(Pkg,pkgOrderList::Added);
-   Depth++;
-
-   // Check the dependencies to see if they are all satisfied.
+   /* Because of the ordered list, most dependancies 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 dependancies before configuring. */
    bool Bad = false;
    bool Bad = false;
-   for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); D.end() == false;)
+   for (DepIterator D = instVer.DependsList();
+       D.end() == false; )
    {
    {
-      if (D->Type != pkgCache::Dep::Depends && D->Type != pkgCache::Dep::PreDepends)
-      {
-        D++;
-        continue;
-      }
+      // Compute a single dependency element (glob or)
+      pkgCache::DepIterator Start;
+      pkgCache::DepIterator End;
+      D.GlobOr(Start,End);
       
       
-      // 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)
-           continue;
-
-        SPtrArray<Version *> VList = D.AllTargets();
-        for (Version **I = VList; *I != 0 && Bad == true; I++)
-        {
+      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();
+         
+         // Check through each version of each package that could satisfy this dependancy
+        for (Version **I = VList; *I != 0; I++) {
            VerIterator Ver(Cache,*I);
            VerIterator Ver(Cache,*I);
-           PkgIterator Pkg = Ver.ParentPkg();
+           DepPkg = Ver.ParentPkg();
+           InstallVer = VerIterator(Cache,Cache[DepPkg].InstallVer);
 
 
-           // See if the current version is ok
-           if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true && 
-               Pkg.State() == PkgIterator::NeedsNothing)
+           // Check if the current version of the package is avalible and will satisfy this dependancy
+           if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true && 
+               !List->IsFlag(DepPkg,pkgOrderList::Removed) && DepPkg.State() == PkgIterator::NeedsNothing)
            {
               Bad = false;
            {
               Bad = false;
-              continue;
+              break;
            }
            
            }
            
-           // Not the install version 
-           if (Cache[Pkg].InstallVer != *I || 
-               (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
-              continue;
-           
-           if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == true)
-              Bad = !DepAdd(OList,Pkg,Depth);
-           if (List->IsFlag(Pkg,pkgOrderList::Configured) == true)
-              Bad = false;
+           // Check if the version that is going to be installed will satisfy the dependancy
+           if (Cache[DepPkg].InstallVer == *I) {
+              if (List->IsFlag(DepPkg,pkgOrderList::UnPacked)) {
+                 /* Check for a loop to prevent one forming
+                    If A depends on B and B depends on A, SmartConfigure will
+                    just hop between them if this is not checked */
+                 if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
+                    List->Flag(Pkg,pkgOrderList::Loop);
+                    // If SmartConfigure was succesfull, Bad is false, so break
+                    Bad = !SmartConfigure(DepPkg);
+                    List->RmFlag(Pkg,pkgOrderList::Loop);
+                    if (!Bad) break;
+                 }
+              } else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) {
+                 Bad = false;
+                 break;
+              }
+           }
+        }
+        
+        /* If the dependany is still not satisfied, try, if possible, unpacking a package to satisfy it */
+        if (InstallVer != 0 && Bad) {
+           Bad = false;
+           if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
+              List->Flag(Pkg,pkgOrderList::Loop);
+              if (Debug) 
+                 cout << "  Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
+              SmartUnPack(DepPkg, true);
+              //List->Flag(Pkg,~pkgOrderList::Loop);
+           }
         }
         }
+        
+        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++;
+         }
       }
       }
+   }
+   
+   if (Bad) {
+      if (Debug)
+         _error->Warning(_("Could not configure '%s'. "),Pkg.Name());
+      return false;
+   }
+
+   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.Name(),1);
+
+   if (ConfigurePkgs == true && Configure(Pkg) == false)
+      return false;
       
       
-      if (Bad == true)
+   List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
+
+   if (Cache[Pkg].InstVerIter(Cache)->MultiArch == pkgCache::Version::Same)
+      for (PkgIterator P = Pkg.Group().PackageList();
+          P.end() == false; P = Pkg.Group().NextPkg(P))
       {
       {
-        OList.Flag(Pkg,0,pkgOrderList::Added);
-        OList.pop_back();
-        Depth--;
-        return 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))
+           continue;
+        SmartConfigure(P);
       }
       }
-   }
-   
-   Depth--;
+
+   // Sanity Check
+   if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
+      return _error->Error(_("Could not configure '%s'. "),Pkg.Name());
+
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/
@@ -446,28 +498,46 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
       return true;
 
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
       return true;
 
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
+
    return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);
    return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);
+   return true;
 }
                                                                        /*}}}*/
 // PM::SmartUnPack - Install helper                                    /*{{{*/
 // ---------------------------------------------------------------------
 }
                                                                        /*}}}*/
 // 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 allready
+   unpacked, or when it has been unpacked, if Immediate==true it configures it. */
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 {
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 {
+   return SmartUnPack(Pkg, true);
+}
+bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
+{
+   if (Debug)
+      clog << "SmartUnPack " << Pkg.Name() << endl;
+
    // Check if it is already unpacked
    if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
        Cache[Pkg].Keep() == true)
    {
       List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
    // Check if it is already unpacked
    if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
        Cache[Pkg].Keep() == true)
    {
       List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
-      if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
+      if (Immediate == true &&
+         List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
         if (SmartConfigure(Pkg) == false)
         if (SmartConfigure(Pkg) == false)
-           return _error->Error("Internal Error, Could not perform immediate configuration (1) on %s",Pkg.Name());
+           _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;
    }
       return true;
    }
-
-   /* See if this packages install version has any predependencies
-      that are not met by 'now' packages. */
-   for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); 
+   
+   VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
+
+   /* PreUnpack Checks: This loop checks and attempts to rectify and 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 dependancy 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. */
+   for (DepIterator D = instVer.DependsList();
        D.end() == false; )
    {
       // Compute a single dependency element (glob or)
        D.end() == false; )
    {
       // Compute a single dependency element (glob or)
@@ -477,6 +547,9 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
       
       while (End->Type == pkgCache::Dep::PreDepends)
       {
       
       while (End->Type == pkgCache::Dep::PreDepends)
       {
+        if (Debug)
+           clog << "PreDepends order for " << Pkg.Name() << std::endl;
+
         // Look for possible ok targets.
         SPtrArray<Version *> VList = Start.AllTargets();
         bool Bad = true;
         // Look for possible ok targets.
         SPtrArray<Version *> VList = Start.AllTargets();
         bool Bad = true;
@@ -490,6 +563,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
                Pkg.State() == PkgIterator::NeedsNothing)
            {
               Bad = false;
                Pkg.State() == PkgIterator::NeedsNothing)
            {
               Bad = false;
+              if (Debug)
+                 clog << "Found ok package " << Pkg.Name() << endl;
               continue;
            }
         }
               continue;
            }
         }
@@ -504,7 +579,14 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
            if (Cache[Pkg].InstallVer != *I || 
                (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
               continue;
            if (Cache[Pkg].InstallVer != *I || 
                (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
               continue;
+              
+           if (List->IsFlag(Pkg,pkgOrderList::Configured)) {
+              Bad = false;
+              continue;
+           }
 
 
+           if (Debug)
+              clog << "Trying to SmartConfigure " << Pkg.Name() << endl;
            Bad = !SmartConfigure(Pkg);
         }
 
            Bad = !SmartConfigure(Pkg);
         }
 
@@ -519,7 +601,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
                                    End.TargetPkg().Name(),Pkg.Name());
            Start++;
         }
                                    End.TargetPkg().Name(),Pkg.Name());
            Start++;
         }
-        else
+        else 
            break;
       }
       
            break;
       }
       
@@ -532,36 +614,101 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
         for (Version **I = VList; *I != 0; I++)
         {
            VerIterator Ver(Cache,*I);
         for (Version **I = VList; *I != 0; I++)
         {
            VerIterator Ver(Cache,*I);
-           PkgIterator Pkg = Ver.ParentPkg();
+           PkgIterator ConflictPkg = Ver.ParentPkg();
+           VerIterator InstallVer(Cache,Cache[ConflictPkg].InstallVer);
            
            // See if the current version is conflicting
            
            // See if the current version is conflicting
-           if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true)
-           {
-              if (EarlyRemove(Pkg) == false)
-                 return _error->Error("Internal Error, Could not early remove %s",Pkg.Name());
+           if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg))
+           { 
+              cout << Pkg.Name() << " conflicts with " << ConflictPkg.Name() << endl;
+              /* If a loop is not present or has not yet been detected, attempt to unpack packages 
+                 to resolve this conflict. If there is a loop present, remove packages to resolve this conflict */
+              if (!List->IsFlag(ConflictPkg,pkgOrderList::Loop)) {
+                 if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0) {
+                     if (Debug)
+                        cout << "Unpacking " << ConflictPkg.Name() << " to prevent conflict" << endl;
+                      List->Flag(Pkg,pkgOrderList::Loop);
+                     SmartUnPack(ConflictPkg,false);
+                     // Remove loop to allow it to be used later if needed
+                     List->RmFlag(Pkg,pkgOrderList::Loop);
+                  } else {
+                      if (EarlyRemove(ConflictPkg) == false)
+                         return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name());
+                  }
+              } else {
+                 if (!List->IsFlag(ConflictPkg,pkgOrderList::Removed)) {
+                     if (Debug)
+                         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());
+                 }
+              }
+           }
+        }
+      }
+      
+      // Check for breaks
+      if (End->Type == pkgCache::Dep::DpkgBreaks) {
+         SPtrArray<Version *> VList = End.AllTargets();
+        for (Version **I = VList; *I != 0; I++)
+        {
+           VerIterator Ver(Cache,*I);
+           PkgIterator BrokenPkg = Ver.ParentPkg();
+           VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
+           
+           // 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);
+             List->RmFlag(Pkg,pkgOrderList::Loop);
+           }
+           // 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);
            }
         }
       }
    }
            }
         }
       }
    }
-
+   
    // Check for reverse conflicts.
    if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
    // Check for reverse conflicts.
    if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
-                  Cache[Pkg].InstVerIter(Cache).VerStr()) == false)
-      return false;
-   
-   for (PrvIterator P = Cache[Pkg].InstVerIter(Cache).ProvidesList(); 
-       P.end() == false; P++)
-      CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
-   
-   if (Install(Pkg,FileNames[Pkg->ID]) == false)
-      return false;
+                  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);
    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);
+      }
+
+   if(Install(Pkg,FileNames[Pkg->ID]) == false)
+      return false;
+
+   if (Immediate == true && List->IsFlag(Pkg,pkgOrderList::Immediate) == true) {
    
    
-   // Perform immedate configuration of the package.
-   if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
-      if (SmartConfigure(Pkg) == false)
-        return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());
+      // Perform immedate configuration of the package. 
+         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);
+   }
    
    return true;
 }
    
    return true;
 }
@@ -577,9 +724,12 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
    Reset();
    
    if (Debug == true)
    Reset();
    
    if (Debug == true)
-      clog << "Begining to order" << endl;
+      clog << "Beginning to order" << endl;
 
 
-   if (List->OrderUnpack(FileNames) == false)
+   bool const ordering =
+       _config->FindB("PackageManager::UnpackAll",true) ?
+               List->OrderUnpack(FileNames) : List->OrderCritical();
+   if (ordering == false)
    {
       _error->Error("Internal ordering error");
       return Failed;
    {
       _error->Error("Internal ordering error");
       return Failed;
@@ -592,12 +742,19 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
    {
       PkgIterator Pkg(Cache,*I);
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
    {
       PkgIterator Pkg(Cache,*I);
-
+      
       if (List->IsNow(Pkg) == false)
       {
       if (List->IsNow(Pkg) == false)
       {
-        if (Debug == true)
-           clog << "Skipping already done " << Pkg.Name() << endl;
+         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;
+        }
         continue;
         continue;
+        
       }
       
       if (List->IsMissing(Pkg) == true)
       }
       
       if (List->IsMissing(Pkg) == true)
@@ -631,8 +788,15 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
         if (SmartUnPack(Pkg) == false)
            return Failed;
       DoneSomething = true;
         if (SmartUnPack(Pkg) == false)
            return Failed;
       DoneSomething = true;
+      
+      if (ImmConfigureAll) {
+         /* ConfigureAll here to pick up and packages left unconfigured becuase they were unpacked in the 
+            "PreUnpack Checks" section */
+         if (!ConfigureAll())
+            return Failed; 
+      }
    }
    }
-   
+
    // Final run through the configure phase
    if (ConfigureAll() == false)
       return Failed;
    // Final run through the configure phase
    if (ConfigureAll() == false)
       return Failed;
@@ -646,7 +810,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
                       PkgIterator(Cache,*I).Name());
         return Failed;
       }
                       PkgIterator(Cache,*I).Name());
         return Failed;
       }
-   }   
+   }
         
    return Completed;
 }
         
    return Completed;
 }
@@ -678,4 +842,4 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
    
    return DoInstallPostFork(statusFd);
 }
    
    return DoInstallPostFork(statusFd);
 }
-                                                                       /*}}}*/
+                                                                       /*}}}*/