updating <date> tags and the po files for the manpages

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 05eb1a06b755e2e6a202c22cad72ab168f43f54d..46fc499c615e5091cddca445f691633fbba3bef6 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -25,9 +25,10 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sptr.h>
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sptr.h>
 

-#include <apti18n.h>

 #include <iostream>
 #include <fcntl.h>
 #include <iostream>
 #include <fcntl.h>

+
+#include <apti18n.h>

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


@@ -36,11 +37,13 @@ bool pkgPackageManager::SigINTStop = false;
 // PM::PackageManager - Constructor                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // PM::PackageManager - Constructor                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgPackageManager::pkgPackageManager(pkgDepCache *pCache) : Cache(*pCache)
+pkgPackageManager::pkgPackageManager(pkgDepCache *pCache) : Cache(*pCache),
+                                                           List(NULL), Res(Incomplete)

 {
    FileNames = new string[Cache.Head().PackageCount];
 {
    FileNames = new string[Cache.Head().PackageCount];

-   List = 0;

    Debug = _config->FindB("Debug::pkgPackageManager",false);
    Debug = _config->FindB("Debug::pkgPackageManager",false);

+   NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+   ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false);

 }
                                                                        /*}}}*/
 // PM::PackageManager - Destructor                                     /*{{{*/
 }
                                                                        /*}}}*/
 // PM::PackageManager - Destructor                                     /*{{{*/


@@ -150,7 +153,7 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned
         if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))
         {
            if(Debug)
         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 " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.FullName() << endl;

            List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
            ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1);
         }
            List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
            ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1);
         }


@@ -169,10 +172,7 @@ bool pkgPackageManager::CreateOrderList()
    
    delete List;
    List = new pkgOrderList(&Cache);
    
    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;
    
    if (Debug && ImmConfigureAll) 
       clog << "CreateOrderList(): Adding Immediate flag for all packages because of APT::Immediate-Configure-All" << endl;
    


@@ -184,12 +184,11 @@ 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 ||
-          (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
+      if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&

          NoImmConfigure == false) || ImmConfigureAll)
       {
         if(Debug && !ImmConfigureAll)
          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) {
         List->Flag(I,pkgOrderList::Immediate);
         
         if (!ImmConfigureAll) {


@@ -258,7 +257,7 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
 
       if (EarlyRemove(D.ParentPkg()) == false)
         return _error->Error("Reverse conflicts early remove for package '%s' failed",
 
       if (EarlyRemove(D.ParentPkg()) == false)
         return _error->Error("Reverse conflicts early remove for package '%s' failed",

-                             Pkg.Name());
+                             Pkg.FullName().c_str());

    }
    return true;
 }
    }
    return true;
 }


@@ -296,9 +295,9 @@ bool pkgPackageManager::ConfigureAll()
       if (ConfigurePkgs == true && SmartConfigure(Pkg, 0) == false) {
          if (ImmConfigureAll)
             _error->Error(_("Could not perform immediate configuration on '%s'. "
       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);
+                       "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),1);

          else
          else

-            _error->Error("Internal error, packages left unconfigured. %s",Pkg.Name());
+            _error->Error("Internal error, packages left unconfigured. %s",Pkg.FullName().c_str());

         return false;
       }
       
         return false;
       }
       


@@ -323,11 +322,11 @@ bool pkgPackageManager::ConfigureAll()
 bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 {
    // If this is true, only check and correct and dependencies without the Loop flag
 bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 {
    // If this is true, only check and correct and dependencies without the Loop flag

-   bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
+   bool const PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);

 
    if (Debug) {
       VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
 
    if (Debug) {
       VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);

-      clog << OutputInDepth(Depth) << "SmartConfigure " << Pkg.Name() << " (" << InstallVer.VerStr() << ")";
+      clog << OutputInDepth(Depth) << "SmartConfigure " << Pkg.FullName() << " (" << InstallVer.VerStr() << ")";

       if (PkgLoop)
         clog << " (Only Correct Dependencies)";
       clog << endl;
       if (PkgLoop)
         clog << " (Only Correct Dependencies)";
       clog << endl;


@@ -338,103 +337,140 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
    /* 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. */
    /* 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, Changed = false;
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+   unsigned int i=0;
+   do

    {
    {

-      // 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();
-         
-         // 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();
-           InstallVer = VerIterator(Cache,Cache[DepPkg].InstallVer);
-
-           // 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)
+      Changed = false;
+      for (DepIterator D = instVer.DependsList(); D.end() == false; )
+      {
+        // Compute a single dependency element (glob or)
+        pkgCache::DepIterator Start, End;
+        D.GlobOr(Start,End);
+
+        if (End->Type != pkgCache::Dep::Depends)
+           continue;
+        Bad = true;
+
+        // Search for dependencies which are unpacked but aren't configured yet (maybe loops)
+        for (DepIterator Cur = Start; true; ++Cur)
+        {
+           SPtrArray<Version *> VList = Cur.AllTargets();
+
+           for (Version **I = VList; *I != 0; ++I)

            {
            {

-              Bad = false;
-              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 (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 {
-                   /* 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;
-                 break;
+              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)
+              {
+                 Bad = false;
+                 break;
+              }
+
+              // 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;
+                 }
+                 /* 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 */
+                 if (PkgLoop == false)
+                    List->Flag(Pkg,pkgOrderList::Loop);
+                 if (SmartConfigure(DepPkg, Depth + 1) == true)
+                 {
+                    Bad = false;
+                    if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
+                       Changed = true;
+                 }
+                 if (PkgLoop == false)
+                   List->RmFlag(Pkg,pkgOrderList::Loop);
+                 // If SmartConfigure was succesfull, Bad is false, so break
+                 if (Bad == false)
+                    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) {
-           if (List->IsNow(DepPkg)) {
-              Bad = false;
-              if (List->IsFlag(Pkg,pkgOrderList::Loop))
+           if (Cur == End)
+              break;
+         }
+
+        if (Bad == false)
+           continue;
+
+        // Check for dependencies that have not been unpacked, probably due to loops.
+        for (DepIterator Cur = Start; true; ++Cur)
+        {
+           SPtrArray<Version *> VList = Cur.AllTargets();
+
+           for (Version **I = VList; *I != 0; ++I)
+           {
+              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 || List->IsNow(DepPkg) == false)
+                 continue;
+
+              if (PkgLoop == true)

               {
                  if (Debug)
                     std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
               {
                  if (Debug)
                     std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;

+                 Bad = false;
+                 break;

               }
               else
               {
               }
               else
               {

-                 List->Flag(Pkg,pkgOrderList::Loop);

                  if (Debug)
                  if (Debug)

-                    cout << OutputInDepth(Depth) << "Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
-                 SmartUnPack(DepPkg, true, Depth + 1);
-                 List->RmFlag(Pkg,pkgOrderList::Loop);
+                    clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl;
+                 if (PkgLoop == false)
+                    List->Flag(Pkg,pkgOrderList::Loop);
+                 if (SmartUnPack(DepPkg, true, Depth + 1) == true)
+                 {
+                    Bad = false;
+                    if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
+                       Changed = true;
+                 }
+                 if (PkgLoop == false)
+                    List->RmFlag(Pkg,pkgOrderList::Loop);
+                 if (Bad == false)
+                    break;

               }
            }
               }
            }

+
+           if (Cur == End)
+              break;

         }
         }

-        
-        if (Start==End) {
-           if (Bad && Debug && List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
-                 std::clog << OutputInDepth(Depth) << "Could not satisfy dependencies for " << Pkg.Name() << std::endl;
-           break;
-        } else {
-            Start++;
-         }
+
+        if (Bad == true && Changed == false && Debug == true)
+           std::clog << OutputInDepth(Depth) << "Could not satisfy " << Start << std::endl;

       }
       }

-   }
+      if (i++ > max_loops)
+         return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack for %s, aborting", Pkg.FullName().c_str());
+   } while (Changed == true);

    
    if (Bad) {
       if (Debug)
    
    if (Bad) {
       if (Debug)

-         _error->Warning(_("Could not configure '%s'. "),Pkg.Name());
+         _error->Warning(_("Could not configure '%s'. "),Pkg.FullName().c_str());

       return false;
    }
    
       return false;
    }
    


@@ -444,7 +480,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
    static bool const ConfigurePkgs = (conf == "all" || conf == "smart");
 
    if (List->IsFlag(Pkg,pkgOrderList::Configured)) 
    static bool const ConfigurePkgs = (conf == "all" || conf == "smart");
 
    if (List->IsFlag(Pkg,pkgOrderList::Configured)) 

-      return _error->Error("Internal configure error on '%s'.", Pkg.Name());
+      return _error->Error("Internal configure error on '%s'.", Pkg.FullName().c_str());

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


@@ -464,7 +500,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 
    // Sanity Check
    if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
 
    // Sanity Check
    if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)

-      return _error->Error(_("Could not configure '%s'. "),Pkg.Name());
+      return _error->Error(_("Could not configure '%s'. "),Pkg.FullName().c_str());

 
    return true;
 }
 
    return true;
 }


@@ -487,7 +523,8 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
 
    // Essential packages get special treatment
    bool IsEssential = false;
 
    // 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 
       IsEssential = true;
 
    /* Check for packages that are the dependents of essential packages and 


@@ -497,7 +534,8 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
       for (DepIterator D = Pkg.RevDependsList(); D.end() == false &&
           IsEssential == false; ++D)
         if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
       for (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;
    }
 
               IsEssential = true;
    }
 


@@ -508,7 +546,7 @@ 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 "
                                "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());

    }
    
    bool Res = SmartRemove(Pkg);
    }
    
    bool Res = SmartRemove(Pkg);


@@ -544,212 +582,257 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
    bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
 
    if (Debug) {
    bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
 
    if (Debug) {

-      clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.Name();
+      clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.FullName();

       VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
       if (Pkg.CurrentVer() == 0)
       VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
       if (Pkg.CurrentVer() == 0)

-        cout << " (install version " << InstallVer.VerStr() << ")";
+        clog << " (install version " << InstallVer.VerStr() << ")";

       else
       else

-        cout << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")";
+        clog << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")";

       if (PkgLoop)
       if (PkgLoop)

-        cout << " (Only Perform PreUnpack Checks)";
-      cout << endl;
+        clog << " (Only Perform PreUnpack Checks)";
+      clog << endl;

    }
 
    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.
    }
 
    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 
+      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
       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), 
+      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. */
       or by the ConfigureAll call at the end of the for loop in OrderInstall. */

-   for (DepIterator D = instVer.DependsList();
-       D.end() == false; )
+   bool Changed = false;
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+   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 << OutputInDepth(Depth) << "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 << OutputInDepth(Depth) << "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;
-              
-           if (List->IsFlag(Pkg,pkgOrderList::Configured)) {
-              Bad = false;
-              continue;
+              SPtrArray<Version *> VList = Cur.AllTargets();
+              for (Version **I = VList; *I != 0; ++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)
+                 {
+                    Bad = false;
+                    if (Debug)
+                       clog << OutputInDepth(Depth) << "Found ok package " << Pkg.FullName() << endl;
+                    break;
+                 }
+              }
+              if (Cur == End)
+                 break;

            }
 
            }
 

-           if (Debug)
-              clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << Pkg.Name() << endl;
-           Bad = !SmartConfigure(Pkg, Depth + 1);
-        }
+           // Look for something that could be configured.
+           for (DepIterator Cur = Start; Bad == true; ++Cur)
+           {
+              SPtrArray<Version *> VList = Cur.AllTargets();
+              for (Version **I = VList; *I != 0; ++I)
+              {
+                 VerIterator Ver(Cache,*I);
+                 PkgIterator Pkg = Ver.ParentPkg();

 
 

-        /* 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->IsNow(ConflictPkg))
-           { 
-              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)
-                        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 (!List->IsFlag(ConflictPkg,pkgOrderList::Removed)) {
-                     if (Debug)
-                         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());
-                 }
+                 // Not the install version
+                 if (Cache[Pkg].InstallVer != *I ||
+                     (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
+                    continue;
+
+                 if (List->IsFlag(Pkg,pkgOrderList::Configured))
+                 {
+                    Bad = false;
+                    break;
+                 }
+
+                 // check if it needs unpack or if if configure is enough
+                 if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
+                 {
+                    if (Debug)
+                       clog << OutputInDepth(Depth) << "Trying to SmartUnpack " << Pkg.FullName() << endl;
+                    // SmartUnpack with the ImmediateFlag to ensure its really ready
+                    if (SmartUnPack(Pkg, true, Depth + 1) == true)
+                    {
+                       Bad = false;
+                       if (List->IsFlag(Pkg,pkgOrderList::Loop) == false)
+                          Changed = true;
+                       break;
+                    }
+                 }
+                 else
+                 {
+                    if (Debug)
+                       clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << Pkg.FullName() << endl;
+                    if (SmartConfigure(Pkg, Depth + 1) == true)
+                    {
+                       Bad = false;
+                       if (List->IsFlag(Pkg,pkgOrderList::Loop) == false)
+                          Changed = true;
+                       break;
+                    }
+                 }

               }
            }
               }
            }

+
+           if (Bad == true)
+           {
+              if (Start == End)
+                 return _error->Error("Couldn't configure pre-depend %s for %s, "
+                                       "probably a dependency cycle.",
+                                       End.TargetPkg().FullName().c_str(),Pkg.FullName().c_str());
+           }
+           else
+              continue;

         }
         }

-      }
-      
-      // 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)

         {
         {

-           VerIterator Ver(Cache,*I);
-           PkgIterator BrokenPkg = Ver.ParentPkg();
-           if (BrokenPkg.CurrentVer() != Ver)
+           /* 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++)

            {
            {

-              if (Debug)
-                 std::clog << OutputInDepth(Depth) << "  Ignore not-installed version " << Ver.VerStr() << " of " << Pkg.FullName() << " for " << End << std::endl;
-              continue;
-           }
+              VerIterator Ver(Cache,*I);
+              PkgIterator ConflictPkg = Ver.ParentPkg();
+              VerIterator InstallVer(Cache,Cache[ConflictPkg].InstallVer);

 
 

-           // Check if it needs to be unpacked
-           if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == 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 {
-                 // Found a break, so see if we can unpack the package to avoid it
-                 // but do not set loop if another SmartUnPack already deals with it
-                 VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
-                 bool circle = false;
-                 for (pkgCache::DepIterator D = InstallVer.DependsList(); D.end() == false; ++D)
+              // See if the current version is conflicting
+              if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg))
+              {
+                 clog << OutputInDepth(Depth) << Pkg.FullName() << " conflicts with " << ConflictPkg.FullName() << 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) == false)

                  {
                  {

-                    if (D->Type != pkgCache::Dep::PreDepends)
-                       continue;
-                    SPtrArray<Version *> VL = D.AllTargets();
-                    for (Version **I = VL; *I != 0; ++I)
+                    if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0)

                     {
                     {

-                       VerIterator V(Cache,*I);
-                       PkgIterator P = V.ParentPkg();
-                       // we are checking for installation as an easy 'protection' against or-groups and (unchosen) providers
-                       if (P->CurrentVer == 0 || P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V))
-                          continue;
-                       circle = true;
-                       break;
+                       if (Debug)
+                          clog << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.FullName() << " to prevent conflict" << endl;
+                       List->Flag(Pkg,pkgOrderList::Loop);
+                       if (SmartUnPack(ConflictPkg,false, Depth + 1) == true)
+                          if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false)
+                             Changed = true;
+                       // Remove loop to allow it to be used later if needed
+                       List->RmFlag(Pkg,pkgOrderList::Loop);

                     }
                     }

-                    if (circle == true)
-                       break;
+                    else if (EarlyRemove(ConflictPkg) == false)
+                       return _error->Error("Internal Error, Could not early remove %s (1)",ConflictPkg.FullName().c_str());

                  }
                  }

-                 if (circle == true)
+                 else if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == false)

                  {
                     if (Debug)
                  {
                     if (Debug)

-                       cout << OutputInDepth(Depth) << "  Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl;
-                    continue;
+                       clog << OutputInDepth(Depth) << "Because of conficts knot, removing " << ConflictPkg.FullName() << " to conflict violation" << endl;
+                    if (EarlyRemove(ConflictPkg) == false)
+                       return _error->Error("Internal Error, Could not early remove %s (2)",ConflictPkg.FullName().c_str());
+                 }
+              }
+           }
+        }
+        else 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();
+              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 &&
+                  List->IsNow(BrokenPkg))
+              {
+                 if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) && PkgLoop)
+                 {
+                    // This dependancy has already been dealt with by another SmartUnPack on Pkg
+                    break;

                  }
                  else
                  {
                  }
                  else
                  {

-                    if (Debug)
+                    // Found a break, so see if we can unpack the package to avoid it
+                    // but do not set loop if another SmartUnPack already deals with it
+                    // Also, avoid it if the package we would unpack pre-depends on this one
+                    VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
+                    bool circle = false;
+                    for (pkgCache::DepIterator D = InstallVer.DependsList(); D.end() == false; ++D)
+                    {
+                       if (D->Type != pkgCache::Dep::PreDepends)
+                          continue;
+                       SPtrArray<Version *> VL = D.AllTargets();
+                       for (Version **I = VL; *I != 0; ++I)
+                       {
+                          VerIterator V(Cache,*I);
+                          PkgIterator P = V.ParentPkg();
+                          // we are checking for installation as an easy 'protection' against or-groups and (unchosen) providers
+                          if (P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V))
+                             continue;
+                          circle = true;
+                          break;
+                       }
+                       if (circle == true)
+                          break;
+                    }
+                    if (circle == true)

                     {
                     {

-                       cout << OutputInDepth(Depth) << "  Unpacking " << BrokenPkg.FullName() << " to avoid " << End;
-                       if (PkgLoop == true)
-                          cout << " (Looping)";
-                       cout << std::endl;
+                       if (Debug)
+                          clog << OutputInDepth(Depth) << "  Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl;
+                       continue;
+                    }
+                    else
+                    {
+                       if (Debug)
+                       {
+                          clog << OutputInDepth(Depth) << "  Unpacking " << BrokenPkg.FullName() << " to avoid " << End;
+                          if (PkgLoop == true)
+                             clog << " (Looping)";
+                          clog << std::endl;
+                       }
+                       if (PkgLoop == false)
+                          List->Flag(Pkg,pkgOrderList::Loop);
+                       if (SmartUnPack(BrokenPkg, false, Depth + 1) == true)
+                       {
+                          if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) == false)
+                             Changed = true;
+                       }
+                       if (PkgLoop == false)
+                          List->RmFlag(Pkg,pkgOrderList::Loop);

                     }
                     }

-                    if (PkgLoop == false)
-                       List->Flag(Pkg,pkgOrderList::Loop);
-                    SmartUnPack(BrokenPkg, false, Depth + 1);
-                    if (PkgLoop == false)
-                       List->RmFlag(Pkg,pkgOrderList::Loop);

                  }
               }
                  }
               }

-           } else {

               // Check if a package needs to be removed
               // Check if a package needs to be removed

-              if (Cache[BrokenPkg].Delete() == true && !List->IsFlag(BrokenPkg,pkgOrderList::Configured))
+              else if (Cache[BrokenPkg].Delete() == true && List->IsFlag(BrokenPkg,pkgOrderList::Configured) == false)

               {
                  if (Debug)
               {
                  if (Debug)

-                    cout << OutputInDepth(Depth) << "  Removing " << BrokenPkg.Name() << " to avoid " << End << endl;
+                    clog << OutputInDepth(Depth) << "  Removing " << BrokenPkg.FullName() << " to avoid " << End << endl;

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

-   }
+      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);

    
    // Check for reverse conflicts.
    if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
    
    // Check for reverse conflicts.
    if (CheckRConflicts(Pkg,Pkg.RevDependsList(),


@@ -806,7 +889,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
       // Perform immedate configuration of the package. 
          if (SmartConfigure(Pkg, Depth + 1) == false)
             _error->Warning(_("Could not perform immediate configuration on '%s'. "
       // Perform immedate configuration of the package. 
          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);
+               "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2);

    }
    
    return true;
    }
    
    return true;


@@ -846,11 +929,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       {
          if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) {
             if (SmartConfigure(Pkg, 0) == false && Debug)
       {
          if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) {
             if (SmartConfigure(Pkg, 0) == false && Debug)

-               _error->Warning("Internal Error, Could not configure %s",Pkg.Name());
+               _error->Warning("Internal Error, Could not configure %s",Pkg.FullName().c_str());

             // FIXME: The above warning message might need changing
          } else {
            if (Debug == true)
             // FIXME: The above warning message might need changing
          } else {
            if (Debug == true)

-              clog << "Skipping already done " << Pkg.Name() << endl;
+              clog << "Skipping already done " << Pkg.FullName() << endl;

         }
         continue;
         
         }
         continue;
         


@@ -859,7 +942,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       if (List->IsMissing(Pkg) == true)
       {
         if (Debug == true)
       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");
         if (DoneSomething == false)
         {
            _error->Error("Internal Error, ordering was unable to handle the media swap");


@@ -873,7 +956,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
          Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
          (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
       {
          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;
       }
       
         return Failed;
       }
       


@@ -906,7 +989,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       if (List->IsFlag(*I,pkgOrderList::Configured) == false)
       {
         _error->Error("Internal error, packages left unconfigured. %s",
       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 Failed;
       }
    }