summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-06-26 20:49:47 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-06-26 20:49:47 +0200
commit5c640e864f8b5f1c175682a94f6c6d0dff42d4bc (patch)
tree5432a933252d80c88d3697ddcee30a8905a64e2a
parent320352e00477f3b0cfd12efd736bd08c7908fecc (diff)
always mark the all package if a pseudo package is marked for install
-rw-r--r--apt-pkg/depcache.cc4
-rw-r--r--debian/changelog4
2 files changed, 6 insertions, 2 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 8bca3e36e..c93993ab1 100644
--- 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);
+ // 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;
diff --git a/debian/changelog b/debian/changelog
index 722e7ffc4..fbe814d84 100644
--- 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
+ - 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
@@ -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
- *
- -- 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