* cleanups

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 1780dff09b9a9ef917bed455997a7d59800657a4..a08ccd6027c293f7bc91cfe761e679c648195db3 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.4 1998/07/12 23:58:30 jgg Exp $
+// $Id: packagemanager.cc,v 1.30 2003/04/27 03:04:15 doogie Exp $

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


@@ -16,20 +16,31 @@
 #ifdef __GNUG__
 #pragma implementation "apt-pkg/packagemanager.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "apt-pkg/packagemanager.h"
 #endif

+

 #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/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>
+#include <apt-pkg/sptr.h>
+    
+#include <apti18n.h>    
+#include <iostream>

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

+using namespace std;
+

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

-pkgPackageManager::pkgPackageManager(pkgDepCache &Cache) : Cache(Cache)
+pkgPackageManager::pkgPackageManager(pkgDepCache *pCache) : Cache(*pCache)

 {
    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,36 +52,134 @@ 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);
+      FileNames[Pkg->ID] = string();
+      
+      // Skip packages to erase
+      if (Cache[Pkg].Delete() == true)
+        continue;
+
+      // Skip Packages that need configure only.
+      if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && 
+         Cache[Pkg].Keep() == true)
+        continue;
+
+      // Skip already processed packages
+      if (List->IsNow(Pkg) == false)
+        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);
+   List->SetFileList(FileNames);
+   
+   bool Bad = false;

    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)
-        continue;
-      if (FileNames[I->ID].empty() == false || Cache[I].Delete() == true)
+      if (List->IsMissing(I) == false)

         continue;
         continue;

+   
+      // Okay, this file is missing and we need it. Mark it for keep 
+      Bad = true;

       Cache.MarkKeep(I);
    }
       Cache.MarkKeep(I);
    }

+ 
+   // We have to empty the list otherwise it will not have the new changes
+   delete List;
+   List = 0;
+   
+   if (Bad == false)
+      return true;

    
    // 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()
+{
+   if (List != 0)
+      return true;
+   
+   delete List;
+   List = new pkgOrderList(&Cache);
+   
+   bool NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+   
+   // Generate the list of affected packages and sort it
+   for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
+   {
+      // Ignore no-version packages
+      if (I->VersionList == 0)
+        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) &&
+         NoImmConfigure == false)
+      {
+        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 &&
+         (Cache[I].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall &&
+         (I.Purge() != false || Cache[I].Mode != pkgDepCache::ModeDelete ||
+          (Cache[I].iFlags & pkgDepCache::Purge) != pkgDepCache::Purge))
+        continue;
+      
+      // Append it to the list
+      List->push_back(I);      
+   }
+   
+   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


@@ -95,21 +204,25 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
 {
    for (;D.end() == false; D++)
    {
 {
    for (;D.end() == false; D++)
    {

-      if (D->Type != pkgCache::Dep::Conflicts)
+      if (D->Type != pkgCache::Dep::Conflicts &&
+         D->Type != pkgCache::Dep::Obsoletes)
+        continue;
+
+      // The package hasnt been changed
+      if (List->IsNow(Pkg) == false)

         continue;
       
         continue;
       

-      if (D.ParentPkg() == Pkg)
+      // Ignore self conflicts, ignore conflicts from irrelevent versions
+      if (D.ParentPkg() == Pkg || D.ParentVer() != D.ParentPkg().CurrentVer())

         continue;
       
         continue;
       

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

         continue;
 
         continue;
 

-      if (List->IsNow(Pkg) == false)
-        continue;
-      

       if (EarlyRemove(D.ParentPkg()) == false)
       if (EarlyRemove(D.ParentPkg()) == false)

-        return false;
-   }  
+        return _error->Error("Reverse conflicts early remove for package '%s' failed",
+                             Pkg.Name());
+   }

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -119,7 +232,7 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
    that the final configuration is valid. */
 bool pkgPackageManager::ConfigureAll()
 {
    that the final configuration is valid. */
 bool pkgPackageManager::ConfigureAll()
 {

-   pkgOrderList OList(Cache);
+   pkgOrderList OList(&Cache);

    
    // Populate the order list
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
    
    // Populate the order list
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)


@@ -150,14 +263,14 @@ bool pkgPackageManager::ConfigureAll()
    of it's dependents. */
 bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
 {
    of it's dependents. */
 bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
 {

-   pkgOrderList OList(Cache);
+   pkgOrderList OList(&Cache);

 
    if (DepAdd(OList,Pkg) == false)
       return false;
    
    if (OList.OrderConfigure() == false)
       return false;
 
    if (DepAdd(OList,Pkg) == false)
       return false;
    
    if (OList.OrderConfigure() == false)
       return false;

-
+   

    // Perform the configuring
    for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
    {
    // Perform the configuring
    for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
    {


@@ -187,8 +300,7 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
       return true;
    if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
       return false;
       return true;
    if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
       return false;

-   
-   
+      

    // Put the package on the list
    OList.push_back(Pkg);
    OList.Flag(Pkg,pkgOrderList::Added);
    // Put the package on the list
    OList.push_back(Pkg);
    OList.Flag(Pkg,pkgOrderList::Added);


@@ -213,7 +325,7 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
         if (Bad == false)
            continue;
 
         if (Bad == false)
            continue;
 

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

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


@@ -231,12 +343,12 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
            if (Cache[Pkg].InstallVer != *I || 
                (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
               continue;
            if (Cache[Pkg].InstallVer != *I || 
                (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
               continue;

+           

            if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == true)
               Bad = !DepAdd(OList,Pkg,Depth);
            if (List->IsFlag(Pkg,pkgOrderList::Configured) == true)
               Bad = false;
         }
            if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == true)
               Bad = !DepAdd(OList,Pkg,Depth);
            if (List->IsFlag(Pkg,pkgOrderList::Configured) == true)
               Bad = false;
         }

-        delete [] VList;

       }
       
       if (Bad == true)
       }
       
       if (Bad == true)


@@ -267,6 +379,32 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
    // Woops, it will not be re-installed!
    if (List->IsFlag(Pkg,pkgOrderList::InList) == false)
       return false;
    // Woops, it will not be re-installed!
    if (List->IsFlag(Pkg,pkgOrderList::InList) == false)
       return false;

+
+   // Essential packages get special treatment
+   bool IsEssential = false;
+   if ((Pkg->Flags & pkgCache::Flag::Essential) != 0)
+      IsEssential = true;
+
+   /* Check for packages that are the dependents of essential packages and 
+      promote them too */
+   if (Pkg->CurrentVer != 0)
+   {
+      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)
+              IsEssential = true;
+   }
+
+   if (IsEssential == true)
+   {
+      if (_config->FindB("APT::Force-LoopBreak",false) == false)
+        return _error->Error(_("This installation run will require temporarily "
+                               "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());
+   }

    
    bool Res = SmartRemove(Pkg);
    if (Cache[Pkg].Delete() == false)
    
    bool Res = SmartRemove(Pkg);
    if (Cache[Pkg].Delete() == false)


@@ -284,7 +422,7 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
       return true;
 
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
       return true;
 
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);

-   return Remove(Pkg);
+   return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);

 }
                                                                        /*}}}*/
 // PM::SmartUnPack - Install helper                                    /*{{{*/
 }
                                                                        /*}}}*/
 // PM::SmartUnPack - Install helper                                    /*{{{*/


@@ -299,19 +437,24 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
       List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
       if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
         if (SmartConfigure(Pkg) == false)
       List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
       if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
         if (SmartConfigure(Pkg) == false)

-           return _error->Error("Internal Error, Could not perform immediate configuraton");
+           return _error->Error("Internal Error, Could not perform immediate configuration (1) on %s",Pkg.Name());

       return true;
    }
       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(); 

-       D.end() == false; D++)
+       D.end() == false; )

    {
    {

-      if (D->Type == pkgCache::Dep::PreDepends)
+      // Compute a single dependency element (glob or)
+      pkgCache::DepIterator Start;
+      pkgCache::DepIterator End;
+      D.GlobOr(Start,End);
+      
+      while (End->Type == pkgCache::Dep::PreDepends)

       {
         // Look for possible ok targets.
       {
         // Look for possible ok targets.

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

         bool Bad = true;
         for (Version **I = VList; *I != 0 && Bad == true; I++)
         {
         bool Bad = true;
         for (Version **I = VList; *I != 0 && Bad == true; I++)
         {


@@ -340,20 +483,28 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 
            Bad = !SmartConfigure(Pkg);
         }
 
            Bad = !SmartConfigure(Pkg);
         }

-        
-        delete [] VList;
-        
-        if (Bad == true)
-           return _error->Error("Internal Error, Couldn't configure a pre-depend");

 
 

-        continue;
+        /* 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 (D->Type == pkgCache::Dep::Conflicts)
+      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.. */
       {
         /* Look for conflicts. Two packages that are both in the install
            state cannot conflict so we don't check.. */

-        Version **VList = D.AllTargets();
+        SPtrArray<Version *> VList = End.AllTargets();

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


@@ -366,13 +517,14 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
                  return _error->Error("Internal Error, Could not early remove %s",Pkg.Name());
            }
         }
                  return _error->Error("Internal Error, Could not early remove %s",Pkg.Name());
            }
         }

-        delete [] VList;

       }
    }
 
    // Check for reverse conflicts.
       }
    }
 
    // Check for reverse conflicts.

-   CheckRConflicts(Pkg,Pkg.RevDependsList(),
-                  Cache[Pkg].InstVerIter(Cache).VerStr());
+   if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
+                  Cache[Pkg].InstVerIter(Cache).VerStr()) == false)
+      return false;
+   

    for (PrvIterator P = Cache[Pkg].InstVerIter(Cache).ProvidesList(); 
        P.end() == false; P++)
       CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
    for (PrvIterator P = Cache[Pkg].InstVerIter(Cache).ProvidesList(); 
        P.end() == false; P++)
       CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());


@@ -385,7 +537,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
    // Perform immedate configuration of the package.
    if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
       if (SmartConfigure(Pkg) == false)
    // Perform immedate configuration of the package.
    if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
       if (SmartConfigure(Pkg) == false)

-        return _error->Error("Internal Error, Could not perform immediate configuraton");
+        return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());

    
    return true;
 }
    
    return true;
 }


@@ -393,84 +545,98 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 // PM::OrderInstall - Installation ordering routine                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // PM::OrderInstall - Installation ordering routine                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool pkgPackageManager::OrderInstall()
+pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()

 {
 {

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

    
    

-   // Generate the list of affected packages and sort it
-   for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
+   if (Debug == true)
+      clog << "Begining to order" << endl;
+
+   if (List->OrderUnpack(FileNames) == false)

    {
    {

-      // 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);
+      _error->Error("Internal ordering error");
+      return Failed;

    }
    
    }
    

-   if (List->OrderUnpack() == false)
-      return _error->Error("Internal ordering error");
+   if (Debug == true)
+      clog << "Done ordering" << endl;

 
 

+   bool DoneSomething = false;

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

+
+      if (List->IsNow(Pkg) == false)
+      {
+        if (Debug == true)
+           clog << "Skipping already done " << Pkg.Name() << endl;
+        continue;
+      }
+      
+      if (List->IsMissing(Pkg) == true)
+      {
+        if (Debug == true)
+           clog << "Sequence completed at " << Pkg.Name() << endl;
+        if (DoneSomething == false)
+        {
+           _error->Error("Internal Error, ordering was unable to handle the media swap");
+           return Failed;
+        }       
+        return Incomplete;
+      }

       
       // Sanity check
       
       // Sanity check

-      if (Cache[Pkg].Keep() == true && Pkg.State() == pkgCache::PkgIterator::NeedsNothing)
-        return _error->Error("Internal Error, trying to manipulate a kept package");
+      if (Cache[Pkg].Keep() == true && 
+         Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
+         (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
+      {
+        _error->Error("Internal Error, trying to manipulate a kept package");
+        return Failed;
+      }

       
       // Perform a delete or an install
       if (Cache[Pkg].Delete() == true)
       {
         if (SmartRemove(Pkg) == false)
       
       // Perform a delete or an install
       if (Cache[Pkg].Delete() == true)
       {
         if (SmartRemove(Pkg) == false)

-           return false;        
+           return Failed;

       }
       else
         if (SmartUnPack(Pkg) == false)
       }
       else
         if (SmartUnPack(Pkg) == false)

-           return false;
+           return Failed;
+      DoneSomething = true;

    }
    
    // Final run through the configure phase
    if (ConfigureAll() == false)
    }
    
    // Final run through the configure phase
    if (ConfigureAll() == false)

-      return false;
+      return Failed;

 
    // Sanity check
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
 
    // Sanity check
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)

+   {

       if (List->IsFlag(*I,pkgOrderList::Configured) == false)
       if (List->IsFlag(*I,pkgOrderList::Configured) == false)

-        return _error->Error("Internal error, packages left unconfigured. %s",
-                             PkgIterator(Cache,*I).Name());
-
-   return true;
+      {
+        _error->Error("Internal error, packages left unconfigured. %s",
+                      PkgIterator(Cache,*I).Name());
+        return Failed;
+      }
+   }   
+        
+   return Completed;

 }
                                                                        /*}}}*/
 // PM::DoInstall - Does the installation                               /*{{{*/
 // ---------------------------------------------------------------------
 /* This uses the filenames in FileNames and the information in the
    DepCache to perform the installation of packages.*/
 }
                                                                        /*}}}*/
 // PM::DoInstall - Does the installation                               /*{{{*/
 // ---------------------------------------------------------------------
 /* This uses the filenames in FileNames and the information in the
    DepCache to perform the installation of packages.*/

-bool pkgPackageManager::DoInstall()
+pkgPackageManager::OrderResult pkgPackageManager::DoInstall()

 {
 {

-   return OrderInstall() && Go();
+   OrderResult Res = OrderInstall();
+   if (Res != Failed)
+      if (Go() == false)
+        return Failed;
+   return Res;

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