* apt-pkg/packagemanager.cc:

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index b0dd43629c8c8ff9bfa75d17742f17aec6a3af44..fe9f6eb68e4e2a1c27f33f6678bb34296f685640 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -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,8 +25,8 @@
     
 #include <apti18n.h>    
 #include <iostream>
     
 #include <apti18n.h>    
 #include <iostream>

+#include <fcntl.h> 

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

-

 using namespace std;
 
 // PM::PackageManager - Constructor                                    /*{{{*/
 using namespace std;
 
 // PM::PackageManager - Constructor                                    /*{{{*/


@@ -61,7 +57,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
    if (CreateOrderList() == false)
       return false;
    
    if (CreateOrderList() == false)
       return false;
    

-   if (List->OrderUnpack() == false)
+   bool const ordering =
+       _config->FindB("PackageManager::UnpackAll",true) ?
+               List->OrderUnpack() : List->OrderCritical();
+   if (ordering == false)

       return _error->Error("Internal ordering error");
 
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
       return _error->Error("Internal ordering error");
 
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)


@@ -81,7 +80,7 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
       // Skip already processed packages
       if (List->IsNow(Pkg) == false)
         continue;
       // Skip already processed packages
       if (List->IsNow(Pkg) == false)
         continue;

-        
+

       new pkgAcqArchive(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache),
                        FileNames[Pkg->ID]);
    }
       new pkgAcqArchive(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache),
                        FileNames[Pkg->ID]);
    }


@@ -95,9 +94,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++)
    {


@@ -120,7 +120,40 @@ bool pkgPackageManager::FixMissing()
    return Resolve.ResolveByKeep() == true && Cache.BrokenCount() == 0;   
 }
                                                                        /*}}}*/
    return Resolve.ResolveByKeep() == true && Cache.BrokenCount() == 0;   
 }
                                                                        /*}}}*/

+// 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, unsigned const int &Depth)
+{
+   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 << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.Name() << endl;
+           List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
+           ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1);
+        }
+      }
+   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 +166,7 @@ bool pkgPackageManager::CreateOrderList()
    delete List;
    List = new pkgOrderList(&Cache);
    
    delete List;
    List = new pkgOrderList(&Cache);
    

-   bool NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+   static bool const 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 +180,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


@@ -242,13 +269,16 @@ bool pkgPackageManager::ConfigureAll()
    
    if (OList.OrderConfigure() == false)
       return false;
    
    if (OList.OrderConfigure() == false)
       return false;

-   
+
+   std::string const conf = _config->Find("PackageManager::Configure","all");
+   bool const ConfigurePkgs = (conf == "all");
+

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

-      
-      if (Configure(Pkg) == false)
+
+      if (ConfigurePkgs == true && Configure(Pkg) == false)

         return false;
       
       List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
         return false;
       
       List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);


@@ -263,29 +293,48 @@ 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)
       return false;
    pkgOrderList OList(&Cache);
 
    if (DepAdd(OList,Pkg) == false)
       return false;

-   
-   if (OList.OrderConfigure() == false)
-      return false;
-   
+
+   static std::string const conf = _config->Find("PackageManager::Configure","all");
+   static bool const ConfigurePkgs = (conf == "all" || conf == "smart");
+
+   if (ConfigurePkgs == true)
+      if (OList.OrderConfigure() == false)
+        return false;
+

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

-      if (Configure(Pkg) == false)
+      if (ConfigurePkgs == true && Configure(Pkg) == false)

         return false;
       
       List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
    }
 
         return false;
       
       List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
    }
 

+   if (Cache[Pkg].InstVerIter(Cache)->MultiArch == pkgCache::Version::Same)
+      for (PkgIterator P = Pkg.Group().PackageList();
+          P.end() == false; P = Pkg.Group().NextPkg(P))
+      {
+        if (Pkg == P || List->IsFlag(P,pkgOrderList::Configured) == true ||
+            Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
+             (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
+           continue;
+        SmartConfigure(P);
+      }
+

    // Sanity Check
    if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
    // Sanity Check
    if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)

-      return _error->Error("Internal error, could not immediate configure %s",Pkg.Name());
-   
+      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(),1);
+

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


@@ -300,6 +349,9 @@ 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;

+
+   if (Debug) 
+      std::clog << OutputInDepth(Depth) << "DepAdd: " << Pkg.Name() << std::endl;

       
    // Put the package on the list
    OList.push_back(Pkg);
       
    // Put the package on the list
    OList.push_back(Pkg);


@@ -353,6 +405,8 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
       
       if (Bad == true)
       {
       
       if (Bad == true)
       {

+        if (Debug) 
+           std::clog << OutputInDepth(Depth) << "DepAdd FAILS on: " << Pkg.Name() << std::endl;

         OList.Flag(Pkg,0,pkgOrderList::Added);
         OList.pop_back();
         Depth--;
         OList.Flag(Pkg,0,pkgOrderList::Added);
         OList.pop_back();
         Depth--;


@@ -422,28 +476,38 @@ 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,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);
    return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);

+   return true;

 }
                                                                        /*}}}*/
 // PM::SmartUnPack - Install helper                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* This performs the task of handling pre-depends. */
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 }
                                                                        /*}}}*/
 // PM::SmartUnPack - Install helper                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* This performs the task of handling pre-depends. */
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)

+{
+   return SmartUnPack(Pkg, true);
+}
+bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)

 {
    // Check if it is already unpacked
    if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
        Cache[Pkg].Keep() == true)
    {
       List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
 {
    // Check if it is already unpacked
    if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
        Cache[Pkg].Keep() == true)
    {
       List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);

-      if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
+      if (Immediate == true &&
+         List->IsFlag(Pkg,pkgOrderList::Immediate) == true)

         if (SmartConfigure(Pkg) == false)
         if (SmartConfigure(Pkg) == false)

-           return _error->Error("Internal Error, Could not perform immediate configuration (1) on %s",Pkg.Name());
+           return _error->Error(_("Could not perform immediate configuration on already unpacked '%s'. "
+                       "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name());

       return true;
    }
 
       return true;
    }
 

+   VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
+

    /* See if this packages install version has any predependencies
       that are not met by 'now' packages. */
    /* See if this packages install version has any predependencies
       that are not met by 'now' packages. */

-   for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); 
+   for (DepIterator D = instVer.DependsList();

        D.end() == false; )
    {
       // Compute a single dependency element (glob or)
        D.end() == false; )
    {
       // Compute a single dependency element (glob or)


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


@@ -466,6 +533,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;
            }
         }


@@ -481,6 +550,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);
         }
 


@@ -522,22 +593,35 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 
    // Check for reverse conflicts.
    if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
 
    // Check for reverse conflicts.
    if (CheckRConflicts(Pkg,Pkg.RevDependsList(),

-                  Cache[Pkg].InstVerIter(Cache).VerStr()) == false)
+                  instVer.VerStr()) == false)

       return false;
    
       return false;
    

-   for (PrvIterator P = Cache[Pkg].InstVerIter(Cache).ProvidesList(); 
+   for (PrvIterator P = instVer.ProvidesList();

        P.end() == false; P++)
       CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
        P.end() == false; P++)
       CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());

-   
-   if (Install(Pkg,FileNames[Pkg->ID]) == false)
-      return false;
-   
+

    List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
    List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);

-   
+
+   if (instVer->MultiArch == pkgCache::Version::Same)
+      for (PkgIterator P = Pkg.Group().PackageList();
+          P.end() == false; P = Pkg.Group().NextPkg(P))
+      {
+        if (Pkg == P || List->IsFlag(P,pkgOrderList::UnPacked) == true ||
+            Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
+             (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
+           continue;
+        SmartUnPack(P, false);
+      }
+
+   if(Install(Pkg,FileNames[Pkg->ID]) == false)
+      return false;
+

    // Perform immedate configuration of the package.
    // Perform immedate configuration of the package.

-   if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
+   if (Immediate == true &&
+       List->IsFlag(Pkg,pkgOrderList::Immediate) == true)

       if (SmartConfigure(Pkg) == false)
       if (SmartConfigure(Pkg) == false)

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


@@ -553,9 +637,12 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
    Reset();
    
    if (Debug == true)
    Reset();
    
    if (Debug == true)

-      clog << "Begining to order" << endl;
+      clog << "Beginning to order" << endl;

 
 

-   if (List->OrderUnpack(FileNames) == false)
+   bool const ordering =
+       _config->FindB("PackageManager::UnpackAll",true) ?
+               List->OrderUnpack(FileNames) : List->OrderCritical();
+   if (ordering == false)

    {
       _error->Error("Internal ordering error");
       return Failed;
    {
       _error->Error("Internal ordering error");
       return Failed;


@@ -608,7 +695,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
            return Failed;
       DoneSomething = true;
    }
            return Failed;
       DoneSomething = true;
    }

-   
+

    // Final run through the configure phase
    if (ConfigureAll() == false)
       return Failed;
    // Final run through the configure phase
    if (ConfigureAll() == false)
       return Failed;


@@ -627,6 +714,22 @@ 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
 // PM::DoInstall - Does the installation                               /*{{{*/
 // ---------------------------------------------------------------------
 /* This uses the filenames in FileNames and the information in the