rename ExplodeString to VectorizeString

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 08e7fc00fa5e5e29c3d9eda18affb4220a8cb945..35cc245509e24c34d7e54ecb106dbf1be3886bcc 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -298,6 +298,9 @@ bool pkgPackageManager::ConfigureAll()
    of it's dependents. */
 bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
 {
    of it's dependents. */
 bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
 {

+   if (Debug == true)
+      clog << "SmartConfigure " << Pkg.Name() << endl;
+

    pkgOrderList OList(&Cache);
 
    if (DepAdd(OList,Pkg) == false)
    pkgOrderList OList(&Cache);
 
    if (DepAdd(OList,Pkg) == false)


@@ -467,6 +470,8 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
 
    if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false)
       return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);
 
    if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false)
       return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);

+   else
+      return SmartRemove(Pkg.Group().FindPkg("all"));

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


@@ -499,6 +504,9 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
       
       while (End->Type == pkgCache::Dep::PreDepends)
       {
       
       while (End->Type == pkgCache::Dep::PreDepends)
       {

+        if (Debug == true)
+           clog << "PreDepends order for " << Pkg.Name() << std::endl;
+

         // Look for possible ok targets.
         SPtrArray<Version *> VList = Start.AllTargets();
         bool Bad = true;
         // Look for possible ok targets.
         SPtrArray<Version *> VList = Start.AllTargets();
         bool Bad = true;


@@ -512,6 +520,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
                Pkg.State() == PkgIterator::NeedsNothing)
            {
               Bad = false;
                Pkg.State() == PkgIterator::NeedsNothing)
            {
               Bad = false;

+              if (Debug == true)
+                 clog << "Found ok package " << Pkg.Name() << endl;

               continue;
            }
         }
               continue;
            }
         }


@@ -527,6 +537,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
                (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
               continue;
 
                (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
               continue;
 

+           if (Debug == true)
+              clog << "Trying to SmartConfigure " << Pkg.Name() << endl;

            Bad = !SmartConfigure(Pkg);
         }
 
            Bad = !SmartConfigure(Pkg);
         }
 


@@ -574,11 +586,14 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
    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());

-   
-   if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false &&
-       Install(Pkg,FileNames[Pkg->ID]) == false)
+
+   if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false)
+   {
+      if(Install(Pkg,FileNames[Pkg->ID]) == false)
+         return false;
+   } else if (SmartUnPack(Pkg.Group().FindPkg("all")) == false)

       return false;
       return false;

-   
+

    List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
    
    // Perform immedate configuration of the package.
    List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
    
    // Perform immedate configuration of the package.