* apt-pkg/contrib/cdromutl.cc:

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 491bff110b8938dd55d80427b673ac4848f32b8d..49776aac705b505e703e127f3300e1c566134d97 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -80,7 +80,10 @@ 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;

-        
+
+      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]);
    }


@@ -277,8 +280,10 @@ bool pkgPackageManager::ConfigureAll()
    for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
    {
       PkgIterator Pkg(Cache,*I);
    for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
    {
       PkgIterator Pkg(Cache,*I);

-      
-      if (ConfigurePkgs == true && Configure(Pkg) == false)
+
+      if (ConfigurePkgs == true &&
+         pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false &&
+         Configure(Pkg) == false)

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


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

-      if (ConfigurePkgs == true && Configure(Pkg) == false)
+      if (ConfigurePkgs == true &&
+         pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false &&
+         Configure(Pkg) == false)

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


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


@@ -391,6 +401,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--;


@@ -460,7 +472,12 @@ 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);
+
+   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;

 }
                                                                        /*}}}*/
 // PM::SmartUnPack - Install helper                                    /*{{{*/
 }
                                                                        /*}}}*/
 // PM::SmartUnPack - Install helper                                    /*{{{*/


@@ -574,10 +591,23 @@ 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 (Install(Pkg,FileNames[Pkg->ID]) == false)
-      return false;
-   
+
+   if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false)
+   {
+      if(Install(Pkg,FileNames[Pkg->ID]) == false)
+         return false;
+   } else {
+      // Pseudo packages will not be unpacked - instead we will do this
+      // for the "real" package, but only once and if it is already
+      // configured we don't need to unpack it again…
+      PkgIterator const P = Pkg.Group().FindPkg("all");
+      if (List->IsFlag(P,pkgOrderList::UnPacked) != true &&
+         List->IsFlag(P,pkgOrderList::Configured) != true &&
+         P.State() != pkgCache::PkgIterator::NeedsNothing) {
+        if (SmartUnPack(P) == 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.