merge sources.list lines based on Release filename

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 9cbb3fbd2373c1963ad871787c3328ace880f150..77a6b0e57547a84c8584e17614b403ae5dcad12c 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -6,7 +6,7 @@
    Package Manager - Abstacts the package manager
 
    More work is needed in the area of transitioning provides, ie exim
    Package Manager - Abstacts the package manager
 
    More work is needed in the area of transitioning provides, ie exim

-   replacing smail. This can cause interesing side effects.
+   replacing smail. This can cause interesting side effects.

 
    Other cases involving conflicts+replaces should be tested. 
    
 
    Other cases involving conflicts+replaces should be tested. 
    


@@ -28,6 +28,7 @@
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/install-progress.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/install-progress.h>

+#include <apt-pkg/prettyprinters.h>

 
 #include <stddef.h>
 #include <list>
 
 #include <stddef.h>
 #include <list>


@@ -136,7 +137,7 @@ bool pkgPackageManager::FixMissing()
 // PM::ImmediateAdd - Add the immediate flag recursivly                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This adds the immediate flag to the pkg and recursively to the
 // PM::ImmediateAdd - Add the immediate flag recursivly                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This adds the immediate flag to the pkg and recursively to the

-   dependendies 
+   dependencies

  */
 void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
 {
  */
 void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
 {


@@ -159,7 +160,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.FullName() << endl;
+              clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << APT::PrettyPkg(&Cache, D.TargetPkg()) << " cause of " << D.DepType() << " " << I.FullName() << endl;

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


@@ -189,7 +190,7 @@ bool pkgPackageManager::CreateOrderList()
       if (I->VersionList == 0)
         continue;
       
       if (I->VersionList == 0)
         continue;
       

-      // Mark the package and its dependends for immediate configuration
+      // Mark the package and its dependents for immediate configuration

       if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
          NoImmConfigure == false) || ImmConfigureAll)
       {
       if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
          NoImmConfigure == false) || ImmConfigureAll)
       {


@@ -408,7 +409,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
         pkgCache::DepIterator Start, End;
         D.GlobOr(Start,End);
 
         pkgCache::DepIterator Start, End;
         D.GlobOr(Start,End);
 

-        if (End->Type != pkgCache::Dep::Depends)
+        if (End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::PreDepends)

            continue;
         Bad = true;
 
            continue;
         Bad = true;
 


@@ -440,7 +441,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
               if (PkgLoop == true)
               {
                  if (Debug)
               if (PkgLoop == true)
               {
                  if (Debug)

-                    std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure";
+                    std::clog << OutputInDepth(Depth) << "Package " << APT::PrettyPkg(&Cache, Pkg) << " loops in SmartConfigure";

                  if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
                     Bad = false;
                  else if (Debug)
                  if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
                     Bad = false;
                  else if (Debug)


@@ -458,7 +459,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
          if (Bad == false)
          {
             if (Debug)
          if (Bad == false)
          {
             if (Debug)

-               std::clog << OutputInDepth(Depth) << "Found ok dep " << Start.TargetPkg() << std::endl;
+               std::clog << OutputInDepth(Depth) << "Found ok dep " << APT::PrettyPkg(&Cache, Start.TargetPkg()) << std::endl;

             continue;
          }
 
             continue;
          }
 


@@ -487,7 +488,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
               if (PkgLoop == true)
               {
                  if (Debug)
               if (PkgLoop == true)
               {
                  if (Debug)

-                    std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure";
+                    std::clog << OutputInDepth(Depth) << "Package " << APT::PrettyPkg(&Cache, Pkg) << " loops in SmartConfigure";

                  if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
                     Bad = false;
                  else if (Debug)
                  if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
                     Bad = false;
                  else if (Debug)


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

-                    clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl;
+                    clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << APT::PrettyDep(&Cache, Cur) << endl;

                  if (NonLoopingSmart(UNPACK_IMMEDIATE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
                     return false;
               }
                  if (NonLoopingSmart(UNPACK_IMMEDIATE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
                     return false;
               }


@@ -534,7 +535,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
            Discard.GlobOr(Start,End);
         }
 
            Discard.GlobOr(Start,End);
         }
 

-        if (End->Type != pkgCache::Dep::Depends)
+        if (End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::PreDepends)

            continue;
         Bad = true;
 
            continue;
         Bad = true;
 


@@ -561,7 +562,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
                    break;
                  }
                  if (Debug)
                    break;
                  }
                  if (Debug)

-                    std::clog << OutputInDepth(Depth) << "Configure already unpacked " << DepPkg << std::endl;
+                    std::clog << OutputInDepth(Depth) << "Configure already unpacked " << APT::PrettyPkg(&Cache, DepPkg) << std::endl;

                  if (NonLoopingSmart(CONFIGURE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
                     return false;
                  break;
                  if (NonLoopingSmart(CONFIGURE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
                     return false;
                  break;


@@ -579,7 +580,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 
 
         if (Bad == true && Changed == false && Debug == true)
 
 
         if (Bad == true && Changed == false && Debug == true)

-           std::clog << OutputInDepth(Depth) << "Could not satisfy " << *D << std::endl;
+           std::clog << OutputInDepth(Depth) << "Could not satisfy " << APT::PrettyDep(&Cache, *D) << std::endl;

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


@@ -848,21 +849,21 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
               if (ConflictPkg.CurrentVer() != Ver)
               {
                  if (Debug)
               if (ConflictPkg.CurrentVer() != Ver)
               {
                  if (Debug)

-                    std::clog << OutputInDepth(Depth) << "Ignore not-installed version " << Ver.VerStr() << " of " << ConflictPkg.FullName() << " for " << End << std::endl;
+                    std::clog << OutputInDepth(Depth) << "Ignore not-installed version " << Ver.VerStr() << " of " << ConflictPkg.FullName() << " for " << APT::PrettyDep(&Cache, End) << std::endl;

                  continue;
               }
 
               if (List->IsNow(ConflictPkg) == false)
               {
                  if (Debug)
                  continue;
               }
 
               if (List->IsNow(ConflictPkg) == false)
               {
                  if (Debug)

-                    std::clog << OutputInDepth(Depth) << "Ignore already dealt-with version " << Ver.VerStr() << " of " << ConflictPkg.FullName() << " for " << End << std::endl;
+                    std::clog << OutputInDepth(Depth) << "Ignore already dealt-with version " << Ver.VerStr() << " of " << ConflictPkg.FullName() << " for " << APT::PrettyDep(&Cache, End) << std::endl;

                  continue;
               }
 
               if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == true)
               {
                  if (Debug)
                  continue;
               }
 
               if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == true)
               {
                  if (Debug)

-                    clog << OutputInDepth(Depth) << "Ignoring " << End << " as " << ConflictPkg.FullName() << "was temporarily removed" << endl;
+                    clog << OutputInDepth(Depth) << "Ignoring " << APT::PrettyDep(&Cache, End) << " as " << ConflictPkg.FullName() << "was temporarily removed" << endl;

                  continue;
               }
 
                  continue;
               }
 


@@ -871,7 +872,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
                  if (End->Type == pkgCache::Dep::DpkgBreaks && End.IsMultiArchImplicit() == true)
                  {
                     if (Debug)
                  if (End->Type == pkgCache::Dep::DpkgBreaks && End.IsMultiArchImplicit() == true)
                  {
                     if (Debug)

-                       clog << OutputInDepth(Depth) << "Because dependency is MultiArchImplicit we ignored looping on: " << ConflictPkg << endl;
+                       clog << OutputInDepth(Depth) << "Because dependency is MultiArchImplicit we ignored looping on: " << APT::PrettyPkg(&Cache, ConflictPkg) << endl;

                     continue;
                  }
                  if (Debug)
                     continue;
                  }
                  if (Debug)


@@ -891,7 +892,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
               {
                  if (Debug)
                  {
               {
                  if (Debug)
                  {

-                    clog << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.FullName() << " to avoid " << End;
+                    clog << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.FullName() << " to avoid " << APT::PrettyDep(&Cache, End);

                     if (PkgLoop == true)
                        clog << " (Looping)";
                     clog << std::endl;
                     if (PkgLoop == true)
                        clog << " (Looping)";
                     clog << std::endl;


@@ -903,7 +904,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
                     // but if it fails ignore this failure and look for alternative ways of solving
                     if (Debug)
                     {
                     // but if it fails ignore this failure and look for alternative ways of solving
                     if (Debug)
                     {

-                       clog << OutputInDepth(Depth) << "Avoidance unpack of " << ConflictPkg.FullName() << " failed for " << End << " ignoring:" << std::endl;
+                       clog << OutputInDepth(Depth) << "Avoidance unpack of " << ConflictPkg.FullName() << " failed for " << APT::PrettyDep(&Cache, End) << " ignoring:" << std::endl;

                        _error->DumpErrors(std::clog, GlobalError::DEBUG, false);
                     }
                     _error->RevertToStack();
                        _error->DumpErrors(std::clog, GlobalError::DEBUG, false);
                     }
                     _error->RevertToStack();


@@ -911,18 +912,18 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
                     if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == true)
                     {
                        if (Debug)
                     if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == true)
                     {
                        if (Debug)

-                          clog << OutputInDepth(Depth) << "But " << ConflictPkg.FullName() << " was temporarily removed in the meantime to satisfy " << End << endl;
+                          clog << OutputInDepth(Depth) << "But " << ConflictPkg.FullName() << " was temporarily removed in the meantime to satisfy " << APT::PrettyDep(&Cache, End) << endl;

                     }
                     else if (List->IsFlag(Pkg,pkgOrderList::Removed) == true)
                     {
                        if (Debug)
                     }
                     else if (List->IsFlag(Pkg,pkgOrderList::Removed) == true)
                     {
                        if (Debug)

-                          clog << OutputInDepth(Depth) << "But " << Pkg.FullName() << " was temporarily removed in the meantime to satisfy " << End << endl;
+                          clog << OutputInDepth(Depth) << "But " << Pkg.FullName() << " was temporarily removed in the meantime to satisfy " <<  APT::PrettyDep(&Cache, End) << endl;

                     }
                     // or b) we can make one go (removal or dpkg auto-deconfigure)
                     else
                     {
                        if (Debug)
                     }
                     // or b) we can make one go (removal or dpkg auto-deconfigure)
                     else
                     {
                        if (Debug)

-                          clog << OutputInDepth(Depth) << "So temprorary remove/deconfigure " << ConflictPkg.FullName() << " to satisfy " << End << endl;
+                          clog << OutputInDepth(Depth) << "So temprorary remove/deconfigure " << ConflictPkg.FullName() << " to satisfy " <<  APT::PrettyDep(&Cache, End) << endl;

                        if (EarlyRemove(ConflictPkg, &End) == false)
                           return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 2);
                     }
                        if (EarlyRemove(ConflictPkg, &End) == false)
                           return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 2);
                     }


@@ -933,7 +934,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
               else
               {
                  if (Debug)
               else
               {
                  if (Debug)

-                    clog << OutputInDepth(Depth) << "Removing " << ConflictPkg.FullName() << " now to avoid " << End << endl;
+                    clog << OutputInDepth(Depth) << "Removing " << ConflictPkg.FullName() << " now to avoid " << APT::PrettyDep(&Cache, End) << endl;

                  // no earlyremove() here as user has already agreed to the permanent removal
                  if (SmartRemove(Pkg) == false)
                     return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 1);
                  // no earlyremove() here as user has already agreed to the permanent removal
                  if (SmartRemove(Pkg) == false)
                     return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 1);


@@ -951,7 +952,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
    if (couldBeTemporaryRemoved == true && List->IsFlag(Pkg,pkgOrderList::Removed) == true)
    {
       if (Debug)
    if (couldBeTemporaryRemoved == true && List->IsFlag(Pkg,pkgOrderList::Removed) == true)
    {
       if (Debug)

-        std::clog << OutputInDepth(Depth) << "Prevent unpack as " << Pkg << " is currently temporarily removed" << std::endl;
+        std::clog << OutputInDepth(Depth) << "Prevent unpack as " << APT::PrettyPkg(&Cache, Pkg) << " is currently temporarily removed" << std::endl;

       return true;
    }
 
       return true;
    }