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 73637d071ad2c672da862dae7dd2616ce8676b0c..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;
 


@@ -337,7 +338,10 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
       however if there is a loop (A depends on B, B depends on A) this will not 
       be the case, so check for dependencies before configuring. */
    bool Bad = false, Changed = false;
       however if there is a loop (A depends on B, B depends on A) this will not 
       be the case, so check for dependencies before configuring. */
    bool Bad = false, Changed = false;

-   do {
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+   unsigned int i=0;
+   do
+   {

       Changed = false;
       for (DepIterator D = instVer.DependsList(); D.end() == false; )
       {
       Changed = false;
       for (DepIterator D = instVer.DependsList(); D.end() == false; )
       {


@@ -437,7 +441,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
               else
               {
                  if (Debug)
               else
               {
                  if (Debug)

-                    cout << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl;
+                    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)
                  if (PkgLoop == false)
                     List->Flag(Pkg,pkgOrderList::Loop);
                  if (SmartUnPack(DepPkg, true, Depth + 1) == true)


@@ -460,6 +464,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
         if (Bad == true && Changed == false && Debug == true)
            std::clog << OutputInDepth(Depth) << "Could not satisfy " << Start << std::endl;
       }
         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) {
    } while (Changed == true);
    
    if (Bad) {


@@ -579,12 +585,12 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
       clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.FullName();
       VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
       if (Pkg.CurrentVer() == 0)
       clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.FullName();
       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);
    }
 
    VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);


@@ -596,7 +602,10 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
       This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
       or by the ConfigureAll call at the end of the for loop in OrderInstall. */
    bool Changed = false;
       This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
       or by the ConfigureAll call at the end of the for loop in OrderInstall. */
    bool Changed = false;

-   do {
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+   unsigned int i = 0;
+   do 
+   {

       Changed = false;
       for (DepIterator D = instVer.DependsList(); D.end() == false; )
       {
       Changed = false;
       for (DepIterator D = instVer.DependsList(); D.end() == false; )
       {


@@ -613,7 +622,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
            // Look for easy targets: packages that are already okay
            for (DepIterator Cur = Start; Bad == true; ++Cur)
            {
            // Look for easy targets: packages that are already okay
            for (DepIterator Cur = Start; Bad == true; ++Cur)
            {

-              SPtrArray<Version *> VList = Start.AllTargets();
+              SPtrArray<Version *> VList = Cur.AllTargets();

               for (Version **I = VList; *I != 0; ++I)
               {
                  VerIterator Ver(Cache,*I);
               for (Version **I = VList; *I != 0; ++I)
               {
                  VerIterator Ver(Cache,*I);


@@ -636,7 +645,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
            // Look for something that could be configured.
            for (DepIterator Cur = Start; Bad == true; ++Cur)
            {
            // Look for something that could be configured.
            for (DepIterator Cur = Start; Bad == true; ++Cur)
            {

-              SPtrArray<Version *> VList = Start.AllTargets();
+              SPtrArray<Version *> VList = Cur.AllTargets();

               for (Version **I = VList; *I != 0; ++I)
               {
                  VerIterator Ver(Cache,*I);
               for (Version **I = VList; *I != 0; ++I)
               {
                  VerIterator Ver(Cache,*I);


@@ -707,7 +716,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
               // 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))
               {

-                 cout << OutputInDepth(Depth) << Pkg.FullName() << " conflicts with " << ConflictPkg.FullName() << endl;
+                 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 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)


@@ -715,7 +724,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
                     if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0)
                     {
                        if (Debug)
                     if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0)
                     {
                        if (Debug)

-                          cout << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.FullName() << " to prevent conflict" << endl;
+                          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)
                        List->Flag(Pkg,pkgOrderList::Loop);
                        if (SmartUnPack(ConflictPkg,false, Depth + 1) == true)
                           if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false)


@@ -729,7 +738,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
                  else if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == false)
                  {
                     if (Debug)
                  else if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == false)
                  {
                     if (Debug)

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


@@ -776,7 +785,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
                           VerIterator V(Cache,*I);
                           PkgIterator P = V.ParentPkg();
                           // we are checking for installation as an easy 'protection' against or-groups and (unchosen) providers
                           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))
+                          if (P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V))

                              continue;
                           circle = true;
                           break;
                              continue;
                           circle = true;
                           break;


@@ -787,17 +796,17 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
                     if (circle == true)
                     {
                        if (Debug)
                     if (circle == true)
                     {
                        if (Debug)

-                          cout << OutputInDepth(Depth) << "  Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl;
+                          clog << OutputInDepth(Depth) << "  Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl;

                        continue;
                     }
                     else
                     {
                        if (Debug)
                        {
                        continue;
                     }
                     else
                     {
                        if (Debug)
                        {

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

                           if (PkgLoop == true)
                           if (PkgLoop == true)

-                             cout << " (Looping)";
-                          cout << std::endl;
+                             clog << " (Looping)";
+                          clog << std::endl;

                        }
                        if (PkgLoop == false)
                           List->Flag(Pkg,pkgOrderList::Loop);
                        }
                        if (PkgLoop == false)
                           List->Flag(Pkg,pkgOrderList::Loop);


@@ -815,12 +824,14 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
               else if (Cache[BrokenPkg].Delete() == true && List->IsFlag(BrokenPkg,pkgOrderList::Configured) == false)
               {
                  if (Debug)
               else if (Cache[BrokenPkg].Delete() == true && List->IsFlag(BrokenPkg,pkgOrderList::Configured) == false)
               {
                  if (Debug)

-                    cout << OutputInDepth(Depth) << "  Removing " << BrokenPkg.FullName() << " 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.
    } while (Changed == true);
    
    // Check for reverse conflicts.