* added gpgv::Options to configure-index

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 99710469b8903325351fad995bdd4fc1c2a709f9..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.25 2000/05/12 04:26:42 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,6 +16,7 @@
 #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/packagemanager.h>
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>


@@ -24,12 +25,18 @@
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/configuration.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;


@@ -88,7 +95,7 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
    be downloaded. */
 bool pkgPackageManager::FixMissing()
 {   
    be downloaded. */
 bool pkgPackageManager::FixMissing()
 {   

-   pkgProblemResolver Resolve(Cache);
+   pkgProblemResolver Resolve(&Cache);

    List->SetFileList(FileNames);
    
    bool Bad = false;
    List->SetFileList(FileNames);
    
    bool Bad = false;


@@ -124,13 +131,17 @@ bool pkgPackageManager::CreateOrderList()
       return true;
    
    delete List;
       return true;
    
    delete List;

-   List = new pkgOrderList(Cache);
+   List = new pkgOrderList(&Cache);

    
    

-   bool NoImmConfigure = _config->FindB("APT::Immediate-Configure",false);
+   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++)
    {
    
    // 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) &&
       // 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) &&


@@ -193,7 +204,8 @@ 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
         continue;
 
       // The package hasnt been changed


@@ -204,9 +216,9 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
       if (D.ParentPkg() == Pkg || D.ParentVer() != D.ParentPkg().CurrentVer())
         continue;
       
       if (D.ParentPkg() == Pkg || D.ParentVer() != D.ParentPkg().CurrentVer())
         continue;
       

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

         continue;
         continue;

-      
+

       if (EarlyRemove(D.ParentPkg()) == false)
         return _error->Error("Reverse conflicts early remove for package '%s' failed",
                              Pkg.Name());
       if (EarlyRemove(D.ParentPkg()) == false)
         return _error->Error("Reverse conflicts early remove for package '%s' failed",
                              Pkg.Name());


@@ -220,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++)


@@ -251,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++)
    {


@@ -288,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);


@@ -314,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);


@@ -332,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)


@@ -388,11 +399,11 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
    if (IsEssential == true)
    {
       if (_config->FindB("APT::Force-LoopBreak",false) == false)
    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());
+        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);
    }
    
    bool Res = SmartRemove(Pkg);


@@ -426,7 +437,7 @@ 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 configuration");
+           return _error->Error("Internal Error, Could not perform immediate configuration (1) on %s",Pkg.Name());

       return true;
    }
 
       return true;
    }
 


@@ -443,7 +454,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
       while (End->Type == pkgCache::Dep::PreDepends)
       {
         // Look for possible ok targets.
       while (End->Type == pkgCache::Dep::PreDepends)
       {
         // Look for possible ok targets.

-        Version **VList = Start.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++)
         {


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

-        
-        delete [] VList;

 
         /* If this or element did not match then continue on to the
 
         /* If this or element did not match then continue on to the

-           next or element until a matching element is found*/
+           next or element until a matching element is found */

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

-        {          
+        {
+           // This triggers if someone make a pre-depends/depend loop.

            if (Start == End)
            if (Start == End)

-              return _error->Error("Internal Error, Couldn't configure a pre-depend");
+              return _error->Error("Couldn't configure pre-depend %s for %s, "
+                                   "probably a dependency cycle.",
+                                   End.TargetPkg().Name(),Pkg.Name());

            Start++;
         }
         else
            break;
       }
       
            Start++;
         }
         else
            break;
       }
       

-      if (End->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 = End.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);


@@ -504,7 +517,6 @@ 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;

       }
    }
 
       }
    }
 


@@ -525,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 configuration");
+        return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());

    
    return true;
 }
    
    return true;
 }