* apt-pkg/acquire-item.{cc,h}:

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 35cc245509e24c34d7e54ecb106dbf1be3886bcc..1ae09347a9762fe5de477514ab973b6a6e8fb355 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -81,9 +81,6 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
       if (List->IsNow(Pkg) == false)
         continue;
 
       if (List->IsNow(Pkg) == false)
         continue;
 

-      if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == true)
-        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]);
    }


@@ -281,9 +278,7 @@ bool pkgPackageManager::ConfigureAll()
    {
       PkgIterator Pkg(Cache,*I);
 
    {
       PkgIterator Pkg(Cache,*I);
 

-      if (ConfigurePkgs == true &&
-         pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false &&
-         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);


@@ -318,17 +313,26 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
    {
       PkgIterator Pkg(Cache,*I);
       
    {
       PkgIterator Pkg(Cache,*I);
       

-      if (ConfigurePkgs == true &&
-         pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false &&
-         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) == 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(_("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(),1);
 
    return true;
                        "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1);
 
    return true;


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


@@ -398,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--;


@@ -468,10 +477,7 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
 
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
 
 
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
 

-   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 Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);

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


@@ -479,22 +485,29 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
 // ---------------------------------------------------------------------
 /* This performs the task of handling pre-depends. */
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 // ---------------------------------------------------------------------
 /* 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(_("Could not perform immediate configuration on already unpacked '%s'."
+           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;
    }
 
                        "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
       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)


@@ -580,26 +593,34 @@ 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 (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)
+   List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
+
+   if ((instVer->MultiArch & pkgCache::Version::Same) == 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;
 
       return false;
 

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

    // 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(_("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;