fix typos in comments reported by the lintian in very-picky-modes

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index b3c3d2591a4fc25f4f1527dcc561349c95da81f2..c32c732126a172f6e0aa13bb79d7ecf9d29c763f 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -13,6 +13,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>


@@ -22,10 +24,10 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sptr.h>

-    
-#include <apti18n.h>    
+
+#include <apti18n.h>

 #include <iostream>
 #include <iostream>

-#include <fcntl.h> 
+#include <fcntl.h>

                                                                        /*}}}*/
 using namespace std;
 
                                                                        /*}}}*/
 using namespace std;
 


@@ -65,7 +67,7 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
    if (ordering == false)
       return _error->Error("Internal ordering error");
 
    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();
    {
       PkgIterator Pkg(Cache,*I);
       FileNames[Pkg->ID] = string();


@@ -101,7 +103,7 @@ bool pkgPackageManager::FixMissing()
    List->SetFileList(FileNames);
 
    bool Bad = false;
    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;
    {
       if (List->IsMissing(I) == false)
         continue;


@@ -142,7 +144,7 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned
       D = I.CurrentVer().DependsList(); 
    }
 
       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 (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
       {
         if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))


@@ -175,7 +177,7 @@ bool pkgPackageManager::CreateOrderList()
       clog << "CreateOrderList(): Adding Immediate flag for all packages because of APT::Immediate-Configure-All" << endl;
    
    // Generate the list of affected packages and sort it
       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)
    {
       // Ignore no-version packages
       if (I->VersionList == 0)


@@ -237,7 +239,7 @@ bool pkgPackageManager::DepAlwaysTrue(DepIterator D)
 bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
                                        const char *Ver)
 {
 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)
    {
       if (D->Type != pkgCache::Dep::Conflicts &&
          D->Type != pkgCache::Dep::Obsoletes)


@@ -248,7 +250,7 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
         continue;
       
       // Ignore self conflicts, ignore conflicts from irrelevent versions
         continue;
       
       // Ignore self conflicts, ignore conflicts from irrelevent versions

-      if (D.ParentPkg() == Pkg || D.ParentVer() != D.ParentPkg().CurrentVer())
+      if (D.IsIgnorable(Pkg) || D.ParentVer() != D.ParentPkg().CurrentVer())

         continue;
       
       if (Cache.VS().CheckDep(Ver,D->CompareOp,D.TargetVer()) == false)
         continue;
       
       if (Cache.VS().CheckDep(Ver,D->CompareOp,D.TargetVer()) == false)


@@ -271,7 +273,7 @@ bool pkgPackageManager::ConfigureAll()
    pkgOrderList OList(&Cache);
    
    // Populate the order list
    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);
       if (List->IsFlag(pkgCache::PkgIterator(Cache,*I),
                       pkgOrderList::UnPacked) == true)
         OList.push_back(*I);


@@ -283,7 +285,7 @@ bool pkgPackageManager::ConfigureAll()
    bool const ConfigurePkgs = (conf == "all");
 
    // Perform the configuring
    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);
       
    {
       PkgIterator Pkg(Cache,*I);
       


@@ -291,8 +293,12 @@ bool pkgPackageManager::ConfigureAll()
          calls its self */ 
       if (List->IsFlag(Pkg,pkgOrderList::Configured)) continue;
 
          calls its self */ 
       if (List->IsFlag(Pkg,pkgOrderList::Configured)) continue;
 

-      if (ConfigurePkgs == true && SmartConfigure(Pkg) == 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.Name(),1);
+         else
+            _error->Error("Internal error, packages left unconfigured. %s",Pkg.Name());

         return false;
       }
       
         return false;
       }
       


@@ -304,19 +310,34 @@ bool pkgPackageManager::ConfigureAll()
                                                                        /*}}}*/
 // PM::SmartConfigure - Perform immediate configuration of the pkg     /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // PM::SmartConfigure - Perform immediate configuration of the pkg     /*{{{*/
 // ---------------------------------------------------------------------

-/* This routine trys 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. */
-bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
+/* 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, int const Depth)

 {
 {

-   if (Debug == true)
-      clog << "SmartConfigure " << Pkg.Name() << endl;
-      
+   // If this is true, only check and correct and dependencies without the Loop flag
+   bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
+
+   if (Debug) {
+      VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
+      clog << OutputInDepth(Depth) << "SmartConfigure " << Pkg.Name() << " (" << InstallVer.VerStr() << ")";
+      if (PkgLoop)
+        clog << " (Only Correct Dependencies)";
+      clog << endl;
+   }
+

    VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
       
    VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
       

-   /* 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 */
+   /* 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;
    for (DepIterator D = instVer.DependsList();
        D.end() == false; )
    bool Bad = false;
    for (DepIterator D = instVer.DependsList();
        D.end() == false; )


@@ -335,99 +356,102 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
          VerIterator InstallVer;
          SPtrArray<Version *> VList = Start.AllTargets();
          
          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);
            DepPkg = Ver.ParentPkg();
         for (Version **I = VList; *I != 0; I++) {
            VerIterator Ver(Cache,*I);
            DepPkg = Ver.ParentPkg();

-           
-           if (!Bad) continue;
-              

            InstallVer = VerIterator(Cache,Cache[DepPkg].InstallVer);
            InstallVer = VerIterator(Cache,Cache[DepPkg].InstallVer);

-           //VerIterator CandVer(Cache,Cache[DepPkg].CandidateVer);
-           
-           if (Debug) {
-              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) << " Removed " << List->IsFlag(DepPkg,pkgOrderList::Removed) << endl;
-               
-            }
-
-           // Check if it satisfies this dependancy
+
+           // 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;
            if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true && 
                !List->IsFlag(DepPkg,pkgOrderList::Removed) && DepPkg.State() == PkgIterator::NeedsNothing)
            {
               Bad = false;

-              continue;
+              break;

            }
            
            }
            

+           // 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)) {
            if (Cache[DepPkg].InstallVer == *I) {
               if (List->IsFlag(DepPkg,pkgOrderList::UnPacked)) {

-                 if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
-                    List->Flag(Pkg,pkgOrderList::Loop);
-                    Bad = !SmartConfigure(DepPkg);
+                 if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop) {
+                   // This dependancy has already been dealt with by another SmartConfigure on Pkg
+                   Bad = false;
+                   break;
+                  } else if (List->IsFlag(Pkg,pkgOrderList::Loop)) {
+                   /* 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. Dont remove the 
+                      loop flag after finishing however as loop is already set.
+                      This means that there is another SmartConfigure call for this 
+                      package and it will remove the loop flag */
+                    Bad = !SmartConfigure(DepPkg, Depth + 1);

                  } else {
                  } else {

-                    Bad = false;
+                   /* 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 */
+                   List->Flag(Pkg,pkgOrderList::Loop);
+                   Bad = !SmartConfigure(DepPkg, Depth + 1);
+                   List->RmFlag(Pkg,pkgOrderList::Loop);

                  }
                  }

+                 // If SmartConfigure was succesfull, Bad is false, so break
+                 if (!Bad) break;

               } else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) {
                  Bad = false;
               } else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) {
                  Bad = false;

+                 break;

               }
               }

-              continue;

            }
         }
         
            }
         }
         

+        /* If the dependany is still not satisfied, try, if possible, unpacking a package to satisfy it */

         if (InstallVer != 0 && Bad) {
         if (InstallVer != 0 && Bad) {

-           Bad = false;
-           List->Flag(Pkg,pkgOrderList::Loop);
-           if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
-              if (Debug) 
-                 cout << "  Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
-              SmartUnPack(DepPkg, true);
+           if (List->IsNow(DepPkg)) {
+              Bad = false;
+              if (List->IsFlag(Pkg,pkgOrderList::Loop))
+              {
+                 if (Debug)
+                    std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
+              }
+              else
+              {
+                 List->Flag(Pkg,pkgOrderList::Loop);
+                 if (Debug)
+                    cout << OutputInDepth(Depth) << "Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
+                 SmartUnPack(DepPkg, true, Depth + 1);
+                 List->RmFlag(Pkg,pkgOrderList::Loop);
+              }

            }
         }
         
         if (Start==End) {
            }
         }
         
         if (Start==End) {

-           if (Bad && Debug) {
-              if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
-                  _error->Warning("Could not satisfy dependancies for %s",Pkg.Name());
-               } 
-           }
+           if (Bad && Debug && List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
+                 std::clog << OutputInDepth(Depth) << "Could not satisfy dependencies for " << Pkg.Name() << std::endl;

            break;
            break;

-              

         } else {
             Start++;
          }
       }
    }
         } else {
             Start++;
          }
       }
    }

+   
+   if (Bad) {
+      if (Debug)
+         _error->Warning(_("Could not configure '%s'. "),Pkg.Name());
+      return false;
+   }
+   
+   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)) 
 
    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);
+      return _error->Error("Internal configure error on '%s'.", Pkg.Name());

 
    if (ConfigurePkgs == true && Configure(Pkg) == false)
       return false;
 
    if (ConfigurePkgs == true && Configure(Pkg) == false)
       return false;

-      
+

    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
 
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
 

-   if (Cache[Pkg].InstVerIter(Cache)->MultiArch == pkgCache::Version::Same)
+   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))
       {
       for (PkgIterator P = Pkg.Group().PackageList();
           P.end() == false; P = Pkg.Group().NextPkg(P))
       {


@@ -435,13 +459,12 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
             Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
              (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
            continue;
             Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
              (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
            continue;

-        SmartConfigure(P);
+        SmartConfigure(P, (Depth +1));

       }
 
    // Sanity Check
       }
 
    // Sanity Check

-   if (List->IsFlag(Pkg,pkgOrderList::Configured) == false && Debug)
-      _error->Warning(_("Could not perform immediate configuration on '%s'. "
-                       "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1);
+   if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
+      return _error->Error(_("Could not configure '%s'. "),Pkg.Name());

 
    return true;
 }
 
    return true;
 }


@@ -472,7 +495,7 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
    if (Pkg->CurrentVer != 0)
    {
       for (DepIterator D = Pkg.RevDependsList(); D.end() == false &&
    if (Pkg->CurrentVer != 0)
    {
       for (DepIterator D = Pkg.RevDependsList(); D.end() == false &&

-          IsEssential == false; D++)
+          IsEssential == false; ++D)

         if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
            if ((D.ParentPkg()->Flags & pkgCache::Flag::Essential) != 0)
               IsEssential = true;
         if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
            if ((D.ParentPkg()->Flags & pkgCache::Flag::Essential) != 0)
               IsEssential = true;


@@ -515,33 +538,32 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
    unpacked, or when it has been unpacked, if Immediate==true it configures it. */
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 {
    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.Name();
+      VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
+      if (Pkg.CurrentVer() == 0)
+        cout << " (install version " << InstallVer.VerStr() << ")";
+      else
+        cout << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")";
+      if (PkgLoop)
+        cout << " (Only Perform PreUnpack Checks)";
+      cout << endl;

    }
    }

-   
+

    VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
 
    VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
 

-   /* PreUnpack Checks: This loop checks and attemps to rectify and problems that would prevent the package being unpacked.
-      It addresses: PreDepends, Conflicts, Obsoletes and DpkgBreaks. Any resolutions that do not require it should 
-      avoid configuration (calling SmartUnpack with Immediate=true), this is because any loops before Pkg is unpacked 
-      can cause problems. This will be either dealt with if the package is configured as a dependancy of 
-      Pkg (if and when Pkg is configured), or by the ConfigureAll call at the end of the for loop in OrderInstall. */
+   /* 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; )
    {
    for (DepIterator D = instVer.DependsList();
        D.end() == false; )
    {


@@ -553,7 +575,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
       while (End->Type == pkgCache::Dep::PreDepends)
       {
         if (Debug)
       while (End->Type == pkgCache::Dep::PreDepends)
       {
         if (Debug)

-           clog << "PreDepends order for " << Pkg.Name() << std::endl;
+           clog << OutputInDepth(Depth) << "PreDepends order for " << Pkg.Name() << std::endl;

 
         // Look for possible ok targets.
         SPtrArray<Version *> VList = Start.AllTargets();
 
         // Look for possible ok targets.
         SPtrArray<Version *> VList = Start.AllTargets();


@@ -569,7 +591,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
            {
               Bad = false;
               if (Debug)
            {
               Bad = false;
               if (Debug)

-                 clog << "Found ok package " << Pkg.Name() << endl;
+                 clog << OutputInDepth(Depth) << "Found ok package " << Pkg.Name() << endl;

               continue;
            }
         }
               continue;
            }
         }


@@ -591,8 +613,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
            }
 
            if (Debug)
            }
 
            if (Debug)

-              clog << "Trying to SmartConfigure " << Pkg.Name() << endl;
-           Bad = !SmartConfigure(Pkg);
+              clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << Pkg.Name() << endl;
+           Bad = !SmartConfigure(Pkg, Depth + 1);

         }
 
         /* If this or element did not match then continue on to the
         }
 
         /* If this or element did not match then continue on to the


@@ -604,7 +626,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
               return _error->Error("Couldn't configure pre-depend %s for %s, "
                                    "probably a dependency cycle.",
                                    End.TargetPkg().Name(),Pkg.Name());
               return _error->Error("Couldn't configure pre-depend %s for %s, "
                                    "probably a dependency cycle.",
                                    End.TargetPkg().Name(),Pkg.Name());

-           Start++;
+           ++Start;

         }
         else 
            break;
         }
         else 
            break;


@@ -624,39 +646,18 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
            
            // See if the current version is conflicting
            if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg))
            
            // See if the current version is conflicting
            if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg))

-           {
-               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;
-            }
-           
+           { 
+              cout << OutputInDepth(Depth) << 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)
               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);
+                        cout << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.Name() << " to prevent conflict" << endl;
+                      List->Flag(Pkg,pkgOrderList::Loop);
+                     SmartUnPack(ConflictPkg,false, Depth + 1);
+                     // 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 (EarlyRemove(ConflictPkg) == false)
                          return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name());


@@ -664,7 +665,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
               } else {
                  if (!List->IsFlag(ConflictPkg,pkgOrderList::Removed)) {
                      if (Debug)
               } else {
                  if (!List->IsFlag(ConflictPkg,pkgOrderList::Removed)) {
                      if (Debug)

-                         cout << "Because of conficts knot, removing " << ConflictPkg.Name() << " to conflict violation" << endl;
+                         cout << OutputInDepth(Depth) << "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());
                  }
                      if (EarlyRemove(ConflictPkg) == false)
                           return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name());
                  }


@@ -681,94 +682,102 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
            VerIterator Ver(Cache,*I);
            PkgIterator BrokenPkg = Ver.ParentPkg();
            VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
            VerIterator Ver(Cache,*I);
            PkgIterator BrokenPkg = Ver.ParentPkg();
            VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);

-           
-           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;
-            }
+           if (BrokenPkg.CurrentVer() != Ver)
+           {
+              if (Debug)
+                 std::clog << OutputInDepth(Depth) << "  Ignore not-installed version " << Ver.VerStr() << " of " << Pkg.FullName() << " for " << End << std::endl;
+              continue;
+           }
+

            // Check if it needs to be unpacked
            if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == false && 
            // 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->IsNow(BrokenPkg)) {
+             if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) && PkgLoop) {
+               // This dependancy has already been dealt with by another SmartUnPack on Pkg
+               break;
+             } else if (List->IsFlag(Pkg,pkgOrderList::Loop)) {
+               /* Found a break, so unpack the package, but dont remove loop as already set.
+                  This means that there is another SmartUnPack call for this 
+                  package and it will remove the loop flag. */
+               if (Debug) 
+                 cout << OutputInDepth(Depth) << "  Unpacking " << BrokenPkg.Name() << " to avoid break" << endl;
+                   
+               SmartUnPack(BrokenPkg, false, Depth + 1);
+             } else {
+                List->Flag(Pkg,pkgOrderList::Loop);
+               // Found a break, so unpack the package
+               if (Debug) 
+                 cout << OutputInDepth(Depth) << "  Unpacking " << BrokenPkg.Name() << " to avoid break" << endl;
+                
+               SmartUnPack(BrokenPkg, false, Depth + 1);
+               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) 
            // 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;
+                cout << OutputInDepth(Depth) << "  Removing " << BrokenPkg.Name() << " to avoid break" << endl;

              SmartRemove(BrokenPkg);
            }
         }
       }
    }
    
              SmartRemove(BrokenPkg);
            }
         }
       }
    }
    

-   // 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)
                   instVer.VerStr()) == false)

-        return 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;
-   
-       // 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)
+   if (PkgLoop)
+      return true;
+
+   List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
+
+   if (Immediate == true && (instVer->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
+   {
+      /* 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 && 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 ||
+            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;
+      }
+   }
+   // packages which are already unpacked don't need to be unpacked again
+   else if (Pkg.State() != pkgCache::PkgIterator::NeedsConfigure && Install(Pkg,FileNames[Pkg->ID]) == false)

       return false;
 
       return false;
 

-   if (Immediate == true && List->IsFlag(Pkg,pkgOrderList::Immediate) == true) {
-   
+   if (Immediate == true) {

       // Perform immedate configuration of the package. 
       // Perform immedate configuration of the package. 

-         if (SmartConfigure(Pkg) == false)
+         if (SmartConfigure(Pkg, Depth + 1) == 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);
    }
             _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);
    }


@@ -802,14 +811,14 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       clog << "Done ordering" << endl;
 
    bool DoneSomething = false;
       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) {
    {
       PkgIterator Pkg(Cache,*I);
       
       if (List->IsNow(Pkg) == false)
       {
          if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) {

-            if (SmartConfigure(Pkg) == false && Debug)
+            if (SmartConfigure(Pkg, 0) == false && Debug)

                _error->Warning("Internal Error, Could not configure %s",Pkg.Name());
             // FIXME: The above warning message might need changing
          } else {
                _error->Warning("Internal Error, Could not configure %s",Pkg.Name());
             // FIXME: The above warning message might need changing
          } else {


@@ -848,14 +857,15 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
            return Failed;
       }
       else
            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 becuase they were unpacked in the 
             "PreUnpack Checks" section */
            return Failed;
       DoneSomething = true;
       
       if (ImmConfigureAll) {
          /* ConfigureAll here to pick up and packages left unconfigured becuase they were unpacked in the 
             "PreUnpack Checks" section */

-         ConfigureAll();
+         if (!ConfigureAll())
+            return Failed; 

       }
    }
 
       }
    }
 


@@ -864,7 +874,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       return Failed;
 
    // Sanity check
       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)
       {
    {
       if (List->IsFlag(*I,pkgOrderList::Configured) == false)
       {