Test acquire failover

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index afe5fc176dad3bb04dcf6a9604ff79bf6fd9a9f1..3fc88586bcd2c03fd720dddc04d2084287a507f9 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: packagemanager.cc,v 1.3 1998/07/12 01:26:02 jgg Exp $
+// $Id: packagemanager.cc,v 1.10 1998/12/10 04:22:46 jgg Exp $

 /* ######################################################################
 
    Package Manager - Abstacts the package manager
 /* ######################################################################
 
    Package Manager - Abstacts the package manager


@@ -14,13 +14,16 @@
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #ifdef __GNUG__
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #ifdef __GNUG__

-#pragma implementation "pkglib/packagemanager.h"
+#pragma implementation "apt-pkg/packagemanager.h"

 #endif
 #endif

-#include <pkglib/packagemanager.h>
-#include <pkglib/orderlist.h>
-#include <pkglib/depcache.h>
-#include <pkglib/error.h>
-#include <pkglib/version.h>
+#include <apt-pkg/packagemanager.h>
+#include <apt-pkg/orderlist.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/algorithms.h>
+#include <apt-pkg/configuration.h>

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


@@ -30,6 +33,7 @@ pkgPackageManager::pkgPackageManager(pkgDepCache &Cache) : Cache(Cache)
 {
    FileNames = new string[Cache.Head().PackageCount];
    List = 0;
 {
    FileNames = new string[Cache.Head().PackageCount];
    List = 0;

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

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


@@ -41,22 +45,48 @@ pkgPackageManager::~pkgPackageManager()
    delete [] FileNames;
 }
                                                                        /*}}}*/
    delete [] FileNames;
 }
                                                                        /*}}}*/

+// PM::GetArchives - Queue the archives for download                   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
+                                   pkgRecords *Recs)
+{
+   if (CreateOrderList() == false)
+      return false;
+   
+   if (List->OrderUnpack() == false)
+      return _error->Error("Internal ordering error");
+
+   for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
+   {
+      PkgIterator Pkg(Cache,*I);
+
+      // Skip packages to erase
+      if (Cache[Pkg].Delete() == true)
+        continue;
+
+      // Skip Packages that need configure only.
+      if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure)
+        continue;
+      
+      new pkgAcqArchive(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache),
+                       FileNames[Pkg->ID]);
+   }
+
+   return true;
+}
+                                                                       /*}}}*/

 // PM::FixMissing - Keep all missing packages                          /*{{{*/
 // ---------------------------------------------------------------------
 /* This is called to correct the installation when packages could not
    be downloaded. */
 bool pkgPackageManager::FixMissing()
 {
 // PM::FixMissing - Keep all missing packages                          /*{{{*/
 // ---------------------------------------------------------------------
 /* This is called to correct the installation when packages could not
    be downloaded. */
 bool pkgPackageManager::FixMissing()
 {

-   unsigned char *Touch = new unsigned char[Cache.Head().PackageCount];
+   pkgProblemResolver Resolve(Cache);
+   

    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {

-      // Create the status list that ResolveConflicts needs
-      if ((Cache[I].DepState & pkgDepCache::DepNowMin) == pkgDepCache::DepNowMin)
-        Touch[I->ID] = (1 << 0) | (1 << 1);
-      else
-        Touch[I->ID] = 1 << 1;
-      
-      if (Cache[I].Keep() == true)
+     if (Cache[I].Keep() == true)

         continue;
       if (FileNames[I->ID].empty() == false || Cache[I].Delete() == true)
         continue;
         continue;
       if (FileNames[I->ID].empty() == false || Cache[I].Delete() == true)
         continue;


@@ -64,13 +94,58 @@ bool pkgPackageManager::FixMissing()
    }
    
    // Now downgrade everything that is broken
    }
    
    // Now downgrade everything that is broken

-//   Cache.ResolveConflicts(Touch);
-   delete [] Touch;
-
-   return Cache.BrokenCount() == 0;
+   return Resolve.ResolveByKeep() == true && Cache.BrokenCount() == 0;   

 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+// PM::CreateOrderList - Create the ordering class                     /*{{{*/
+// ---------------------------------------------------------------------
+/* This populates the ordering list with all the packages that are
+   going to change. */
+bool pkgPackageManager::CreateOrderList()
+{
+   delete List;
+   List = new pkgOrderList(Cache);
+   
+   // Generate the list of affected packages and sort it
+   for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
+   {
+      // Mark the package for immediate configuration
+      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
+      {
+        List->Flag(I,pkgOrderList::Immediate);
+        
+        // Look for other packages to make immediate configurea
+        if (Cache[I].InstallVer != 0)
+           for (DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); 
+                D.end() == false; D++)
+              if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
+                 List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
+        
+        // And again with the current version.
+        if (I->CurrentVer != 0)
+           for (DepIterator D = I.CurrentVer().DependsList(); 
+                D.end() == false; D++)
+              if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
+                 List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
+      }
+      
+      // Not interesting
+      if ((Cache[I].Keep() == true || 
+         Cache[I].InstVerIter(Cache) == I.CurrentVer()) && 
+         I.State() == pkgCache::PkgIterator::NeedsNothing)
+        continue;
+      
+      // Append it to the list
+      List->push_back(I);
+      
+      if ((I->Flags & pkgCache::Flag::ImmediateConf) == pkgCache::Flag::ImmediateConf)
+        List->Flag(I,pkgOrderList::Immediate);
+   }
+   
+   return true;
+}
+                                                                       /*}}}*/

 // PM::DepAlwaysTrue - Returns true if this dep is irrelevent          /*{{{*/
 // ---------------------------------------------------------------------
 /* The restriction on provides is to eliminate the case when provides
 // PM::DepAlwaysTrue - Returns true if this dep is irrelevent          /*{{{*/
 // ---------------------------------------------------------------------
 /* The restriction on provides is to eliminate the case when provides


@@ -302,7 +377,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
            return _error->Error("Internal Error, Could not perform immediate configuraton");
       return true;
    }
            return _error->Error("Internal Error, Could not perform immediate configuraton");
       return true;
    }

-   
+

    /* See if this packages install version has any predependencies
       that are not met by 'now' packages. */
    for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); 
    /* See if this packages install version has any predependencies
       that are not met by 'now' packages. */
    for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); 


@@ -395,44 +470,18 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 /* */
 bool pkgPackageManager::OrderInstall()
 {
 /* */
 bool pkgPackageManager::OrderInstall()
 {

-   delete List;
-   List = new pkgOrderList(Cache);
+   if (CreateOrderList() == false)
+      return false;

    
    

-   // Generate the list of affected packages and sort it
-   for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
-   {
-      // Consider all depends
-      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
-      {
-        List->Flag(I,pkgOrderList::Immediate);
-        if (Cache[I].InstallVer != 0)
-           for (DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); 
-                D.end() == false; D++)
-              if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
-                 List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
-        if (I->CurrentVer != 0)
-           for (DepIterator D = I.CurrentVer().DependsList(); 
-                D.end() == false; D++)
-              if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
-                 List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
-      }
-      
-      // Not interesting
-      if ((Cache[I].Keep() == true || 
-         Cache[I].InstVerIter(Cache) == I.CurrentVer()) && 
-         I.State() == pkgCache::PkgIterator::NeedsNothing)
-        continue;
-      
-      // Append it to the list
-      List->push_back(I);
-      
-      if ((I->Flags & pkgCache::Flag::ImmediateConf) == pkgCache::Flag::ImmediateConf)
-        List->Flag(I,pkgOrderList::Immediate);
-   }
+   if (Debug == true)
+      clog << "Begining to order" << endl;

    
    if (List->OrderUnpack() == false)
       return _error->Error("Internal ordering error");
 
    
    if (List->OrderUnpack() == false)
       return _error->Error("Internal ordering error");
 

+   if (Debug == true)
+      clog << "Done ordering" << endl;
+

    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
    {
       PkgIterator Pkg(Cache,*I);
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
    {
       PkgIterator Pkg(Cache,*I);