Added a APT::Immediate-Configure-All option to enable imediate configuration for...

Began adding to the SmartUnpack method to prevent dependancy loops breaking apt.

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index a39e412bdc5ae48fc352908dc756a473accd5eba..ad59470ac260a53604b4ed4e415730ada7ee1f82 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -167,6 +167,10 @@ bool pkgPackageManager::CreateOrderList()
    List = new pkgOrderList(&Cache);
    
    static bool const NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
    List = new pkgOrderList(&Cache);
    
    static bool const NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);

+   ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",true);
+   
+   if (Debug && ImmConfigureAll) 
+      clog << "CreateOrderList(): Adding Immediate flag for all packages because of APT::Immediate-Configure-All" << endl;

    
    // 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++)


@@ -176,19 +180,23 @@ bool pkgPackageManager::CreateOrderList()
         continue;
       
       // Mark the package and its dependends for immediate configuration
         continue;
       
       // Mark the package and its dependends for immediate configuration

-      if (((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
+      if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||

           (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
           (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&

-         NoImmConfigure == false)
+         NoImmConfigure == false) || ImmConfigureAll)

       {
       {

-        if(Debug)
+        if(Debug && !ImmConfigureAll)

            clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl;
         List->Flag(I,pkgOrderList::Immediate);
            clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl;
         List->Flag(I,pkgOrderList::Immediate);

+        
+        if (!ImmConfigureAll) {
+           continue;

 
 

-        // Look for other install packages to make immediate configurea
-        ImmediateAdd(I, true);
+           // Look for other install packages to make immediate configurea
+           ImmediateAdd(I, true);

         
         

-        // And again with the current version.
-        ImmediateAdd(I, false);
+           // And again with the current version.
+           ImmediateAdd(I, false);
+        }

       }
       
       // Not interesting
       }
       
       // Not interesting


@@ -467,7 +475,33 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
         {
            VerIterator Ver(Cache,*I);
            PkgIterator Pkg = Ver.ParentPkg();
         {
            VerIterator Ver(Cache,*I);
            PkgIterator Pkg = Ver.ParentPkg();

-
+           VerIterator InstallVer(Cache,Cache[Pkg].InstallVer);
+           
+           if (Debug) {
+              if (Ver==0) {
+                 cout << OutputInDepth(Depth) << "Checking if the dependancy on " << Ver << " of " << Pkg.Name() << " is  satisfied" << endl;
+              } else {
+                 cout << OutputInDepth(Depth) << "Checking if the dependancy on " << Ver.VerStr() << " of " << Pkg.Name() << " is  satisfied" << endl;
+               }
+            }
+            if (Debug) {
+               if (Pkg.CurrentVer()==0) {
+                  cout << OutputInDepth(Depth) << "  CurrentVer " << Pkg.CurrentVer() << " IsNow " << List->IsNow(Pkg) << " NeedsNothing " << (Pkg.State() == PkgIterator::NeedsNothing) << endl;
+               } else { 
+                  cout << OutputInDepth(Depth) << "  CurrentVer " << Pkg.CurrentVer().VerStr() << " IsNow " << List->IsNow(Pkg) << " NeedsNothing " << (Pkg.State() == PkgIterator::NeedsNothing) << endl;
+               }
+            }
+            
+            if (Debug) {
+               if (InstallVer==0) {
+                  cout << OutputInDepth(Depth )<< "  InstallVer " << InstallVer << endl;
+               } else { 
+                  cout << OutputInDepth(Depth )<< "  InstallVer " << InstallVer.VerStr() << endl; 
+               }
+            }   
+            if (Debug) 
+               cout << OutputInDepth(Depth) << "  Keep " << Cache[Pkg].Keep() << " Unpacked " << List->IsFlag(Pkg,pkgOrderList::UnPacked) << " Configured " << List->IsFlag(Pkg,pkgOrderList::Configured) << endl;
+               

            // See if the current version is ok
            if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true && 
                Pkg.State() == PkgIterator::NeedsNothing)
            // See if the current version is ok
            if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true && 
                Pkg.State() == PkgIterator::NeedsNothing)


@@ -475,6 +509,8 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
               Bad = false;
               continue;
            }
               Bad = false;
               continue;
            }

+           
+           // Keep() , if upgradable, is the package left at the install version

 
            // Not the install version 
            if (Cache[Pkg].InstallVer != *I || 
 
            // Not the install version 
            if (Cache[Pkg].InstallVer != *I || 


@@ -591,7 +627,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
                        "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name());
       return true;
    }
                        "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name());
       return true;
    }

-
+   

    VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
 
    /* See if this packages install version has any predependencies
    VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
 
    /* See if this packages install version has any predependencies


@@ -655,7 +691,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
                                    End.TargetPkg().Name(),Pkg.Name());
            Start++;
         }
                                    End.TargetPkg().Name(),Pkg.Name());
            Start++;
         }

-        else
+        else 

            break;
       }
       
            break;
       }
       


@@ -693,10 +729,56 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
                 packages it breaks) breaks Pkg */ 
              List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
              // Found a break, so unpack the package
                 packages it breaks) breaks Pkg */ 
              List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
              // Found a break, so unpack the package

+             if (Debug) 
+                cout << "  Unpacking " << BrokenPkg.Name() << " to avoid break" << endl;

              SmartUnPack(BrokenPkg, false);
            }
         }
       }
              SmartUnPack(BrokenPkg, false);
            }
         }
       }

+      
+      // Check for dependanices that have not been unpacked, probably due to loops.
+      bool Bad = true; 
+      while (End->Type == pkgCache::Dep::Depends) {
+         PkgIterator DepPkg;
+         SPtrArray<Version *> VList = Start.AllTargets();
+         
+        for (Version **I = VList; *I != 0; I++) {
+           VerIterator Ver(Cache,*I);
+           DepPkg = Ver.ParentPkg();
+           
+           if (!Bad) continue;
+
+           if (Debug) 
+              cout << "  Checking dep on " << DepPkg.Name() << endl;
+           // Check if it satisfies this dependancy
+           if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true && 
+               DepPkg.State() == PkgIterator::NeedsNothing)
+           {
+              Bad = false;
+              continue;
+           }
+           
+           if (Cache[DepPkg].InstallVer == *I && !List->IsNow(DepPkg)) {
+              Bad = false;
+              continue;
+           }
+        }
+        
+        if (Start==End) {
+           if (Bad) {
+              // FIXME Setting the flag here prevents a loop forming 
+              List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
+              // Found a break, so unpack the package
+              if (Debug) 
+                 cout << "  Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
+              //SmartUnPack(DepPkg, false);
+           }
+           break;
+              
+        } else {
+            Start++;
+         }
+      }

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


@@ -728,7 +810,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
    if (Immediate == true &&
        List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
       if (SmartConfigure(Pkg) == false)
    if (Immediate == true &&
        List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
       if (SmartConfigure(Pkg) == false)

-        return _error->Error(_("Could not perform immediate configuration on '%s'. "
+        //return 
+        _error->Error(_("Could not perform immediate configuration on '%s'. "

                        "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2);
    
    return true;
                        "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2);
    
    return true;

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 070b9c04b127330d87ac916b1a3fd42ced3abbbf..dcc9dc2a2327f989d117c079b9ef827bd6abd055 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -48,6 +48,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;

+   bool ImmConfigureAll;

 
    /** \brief saves packages dpkg let disappear
 
 
    /** \brief saves packages dpkg let disappear