* debian/apt.cron.daily:

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index fc5f475a19f6f14a67da664a8ed19170b9deb46f..304d1c653e6b410893d777e9816733f7b3e4145d 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.28 2001/05/27 05:36:04 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


@@ -13,10 +13,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#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>


@@ -29,7 +25,7 @@
     
 #include <apti18n.h>    
 #include <iostream>
     
 #include <apti18n.h>    
 #include <iostream>

-                                                                       /*}}}*/
+#include <fcntl.h> 

 
 using namespace std;
 
 
 using namespace std;
 


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

+   pkgDepCache::ActionGroup group(Cache);

    pkgProblemResolver Resolve(&Cache);
    List->SetFileList(FileNames);
    pkgProblemResolver Resolve(&Cache);
    List->SetFileList(FileNames);

-   
+

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


@@ -106,7 +103,7 @@ bool pkgPackageManager::FixMissing()
    
       // Okay, this file is missing and we need it. Mark it for keep 
       Bad = true;
    
       // Okay, this file is missing and we need it. Mark it for keep 
       Bad = true;

-      Cache.MarkKeep(I);
+      Cache.MarkKeep(I, false, false);

    }
  
    // We have to empty the list otherwise it will not have the new changes
    }
  
    // We have to empty the list otherwise it will not have the new changes


@@ -121,6 +118,41 @@ bool pkgPackageManager::FixMissing()
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+// PM::ImmediateAdd - Add the immediate flag recursivly                        /*{{{*/
+// ---------------------------------------------------------------------
+/* This adds the immediate flag to the pkg and recursively to the
+   dependendies 
+ */
+void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer)
+{
+   DepIterator D;
+   
+   if(UseInstallVer)
+   {
+      if(Cache[I].InstallVer == 0)
+        return;
+      D = Cache[I].InstVerIter(Cache).DependsList(); 
+   } else {
+      if (I->CurrentVer == 0)
+        return;
+      D = I.CurrentVer().DependsList(); 
+   }
+
+   for ( /* nothing */  ; D.end() == false; D++)
+      if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
+      {
+        if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))
+        {
+           if(Debug)
+              clog << "ImmediateAdd(): Adding Immediate flag to " << I.Name() << endl;
+           List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
+           ImmediateAdd(D.TargetPkg(), UseInstallVer);
+        }
+      }
+   return;
+}
+                                                                       /*}}}*/
+

 // PM::CreateOrderList - Create the ordering class                     /*{{{*/
 // ---------------------------------------------------------------------
 /* This populates the ordering list with all the packages that are
 // PM::CreateOrderList - Create the ordering class                     /*{{{*/
 // ---------------------------------------------------------------------
 /* This populates the ordering list with all the packages that are


@@ -133,7 +165,7 @@ bool pkgPackageManager::CreateOrderList()
    delete List;
    List = new pkgOrderList(&Cache);
    
    delete List;
    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++)


@@ -147,21 +179,15 @@ bool pkgPackageManager::CreateOrderList()
           (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
          NoImmConfigure == false)
       {
           (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
          NoImmConfigure == false)
       {

+        if(Debug)
+           clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl;

         List->Flag(I,pkgOrderList::Immediate);
         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);
+
+        // Look for other install packages to make immediate configurea
+        ImmediateAdd(I, true);

         
         // And again with the current version.
         
         // 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);
+        ImmediateAdd(I, false);

       }
       
       // Not interesting
       }
       
       // Not interesting


@@ -483,13 +509,16 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 
            Bad = !SmartConfigure(Pkg);
         }
 
            Bad = !SmartConfigure(Pkg);
         }

-        
+

         /* 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
            Start++;
         }
         else


@@ -590,7 +619,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
          Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
          (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
       {
          Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
          (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
       {

-        _error->Error("Internal Error, trying to manipulate a kept package");
+        _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name());

         return Failed;
       }
       
         return Failed;
       }
       


@@ -624,16 +653,31 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
    return Completed;
 }
                                                                        /*}}}*/
    return Completed;
 }
                                                                        /*}}}*/

+// PM::DoInstallPostFork - Does install part that happens after the fork /*{{{*/
+// ---------------------------------------------------------------------
+pkgPackageManager::OrderResult 
+pkgPackageManager::DoInstallPostFork(int statusFd)
+{
+      if(statusFd > 0)
+         // FIXME: use SetCloseExec here once it taught about throwing
+        //        exceptions instead of doing _exit(100) on failure
+        fcntl(statusFd,F_SETFD,FD_CLOEXEC); 
+      bool goResult = Go(statusFd);
+      if(goResult == false) 
+        return Failed;
+
+      return Res;
+};
+

 // 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.*/

-pkgPackageManager::OrderResult pkgPackageManager::DoInstall()
+pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)

 {
 {

-   OrderResult Res = OrderInstall();
-   if (Res != Failed)
-      if (Go() == false)
-        return Failed;
-   return Res;
+   if(DoInstallPreFork() == Failed)
+      return Failed;
+   
+   return DoInstallPostFork(statusFd);

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