diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 17:02:44 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 17:02:44 +0000 |
| commit | 57e2d8ee90ba33606c471672137de2cc1f4a098c (patch) | |
| tree | add67a463ae8a167afe6538eded77e6007f92fe4 | |
| parent | f084da09cb5f12a821e20f65279044d2726ffe24 (diff) | |
* Patch from Otavio Salvador to avoid listing suggests/...
Author: mdz
Date: 2003-08-08 23:45:00 GMT
* Patch from Otavio Salvador to avoid listing suggests/recommends for
packages which are selected for installation at the same time as the
package which suggests/recommends them (Closes: #200102)
| -rw-r--r-- | cmdline/apt-get.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 0d32b9b39..6aaa4e8c2 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-get.cc,v 1.134 2003/08/07 20:51:50 mdz Exp $ +// $Id: apt-get.cc,v 1.135 2003/08/08 23:45:00 mdz Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -1535,7 +1535,7 @@ bool DoInstall(CommandLine &CmdL) installed already */ string target = string(Start.TargetPkg().Name()) + " "; - if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install) + if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install || Cache[Start.TargetPkg()].Install()) break; /* Does another package suggest it as well? If so, don't print it twice */ @@ -1551,7 +1551,7 @@ bool DoInstall(CommandLine &CmdL) installed already */ string target = string(Start.TargetPkg().Name()) + " "; - if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install) + if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install || Cache[Start.TargetPkg()].Install()) break; /* Does another package recommend it as well? If so, diff --git a/debian/changelog b/debian/changelog index 59042ccaf..dffa1171c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.5.9) unstable; urgency=low * Avoid segfault if a package name is specified which consists entirely of characters which look like end tags ('+', '-') (Closes: #200425) + * Patch from Otavio Salvador to avoid listing suggests/recommends for + packages which are selected for installation at the same time as the + package which suggests/recommends them (Closes: #200102) -- Matt Zimmerman <mdz@debian.org> Fri, 8 Aug 2003 19:31:25 -0400 |