diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-06-03 17:42:15 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-06-03 17:42:15 +0200 |
| commit | bb6dd359654f4debd9816cc27fd893a437eb66cd (patch) | |
| tree | 90455b04278331072984b0536bee3d5a2b238a90 /apt-pkg/depcache.cc | |
| parent | 9bf036e28d4401f92a79f3486095ab1088d7ace5 (diff) | |
| parent | 81fef212a8945e713d6d8f7f0c0030b03d4caf47 (diff) | |
* Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
* Avoid using dbus if dbus-daemon isn't running. Closes: #438803
* apt-pkg/deb/dpkgpm.cc:
- improve apt progress reporting, display trigger actions
* apt-pkg/depcache.cc:
- when checking for new important deps, skip critical ones
(LP: #236360)
* Vietnamese updated. Closes: #479748
* Russian updated. Closes: #479777
* Galician updated. Closes: #479792
* Portuguese updated. Closes: #479847
* Swedish updated. Closes: #479871
* Dutch updated. Closes: #480125
* Kurdish added. Closes: #480150
* Brazilian Portuguese updated. Closes: #480561
* Hungarian updated. Closes: #480662
* Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
* Avoid using dbus if dbus-daemon isn't running. Closes: #438803
* debian/apt.cron.daily:
- apply patch based on the ideas of Francesco Poli for better
behavior when the cache can not be locked (closes: #459344)
Diffstat (limited to 'apt-pkg/depcache.cc')
| -rw-r--r-- | apt-pkg/depcache.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 293630e50..8d8befbdf 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -914,8 +914,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, { //FIXME: deal better with or-groups(?) DepIterator LocalStart = D; - - if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg()) + + if(IsImportantDep(D) && !D.IsCritical() && + Start.TargetPkg() == D.TargetPkg()) { if(!isPreviouslySatisfiedImportantDep) { |