always mark the all package if a pseudo package is marked for install

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 8bca3e36e0eca5a27b7c7307bca240beea7d24ae..c93993ab18d61c8628aaab2eb0f45f9d765267eb 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1255,6 +1255,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
    Update(Pkg);
    AddSizes(Pkg);
 
    Update(Pkg);
    AddSizes(Pkg);
 

+   // always trigger the install of the all package for a pseudo package
+   if (P.CandidateVerIter(*Cache).Pseudo() == true)
+      MarkInstall(Pkg.Group().FindPkg("all"), AutoInst, Depth, FromUser, ForceImportantDeps);
+

    if (AutoInst == false)
       return;
 
    if (AutoInst == false)
       return;
 

diff --git a/debian/changelog b/debian/changelog
index 722e7ffc4b5fb9ff6d4e46a7839ab67974925978..fbe814d84dcd536c715416ea8fc397cd862da51f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low
     - SetCandidateVer for all pseudo packages
     - SetReInstall for the "all" package of a pseudo package
     - use the new MatchAgainstConfig for the DefaultRootSetFunc
     - SetCandidateVer for all pseudo packages
     - SetReInstall for the "all" package of a pseudo package
     - use the new MatchAgainstConfig for the DefaultRootSetFunc

+    - always mark the all package if a pseudo package is marked for install

   * apt-pkg/contrib/error.{cc,h}:
     - complete rewrite but use the same API
     - add NOTICE and DEBUG as new types of a message
   * apt-pkg/contrib/error.{cc,h}:
     - complete rewrite but use the same API
     - add NOTICE and DEBUG as new types of a message


@@ -28,9 +29,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low
   * apt-pkg/contrib/fileutl.cc:
     - show notice about ignored file instead of being always silent
     - add a Dir::Ignore-Files-Silently list option to control the notice
   * apt-pkg/contrib/fileutl.cc:
     - show notice about ignored file instead of being always silent
     - add a Dir::Ignore-Files-Silently list option to control the notice

-  * 

 
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 26 Jun 2010 18:40:01 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 26 Jun 2010 20:43:09 +0200

 
 apt (0.7.26~exp7) experimental; urgency=low
 
 
 apt (0.7.26~exp7) experimental; urgency=low