don't suggest held packages as they are installed (Closes: #578135)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6a3c91a59e505ab1c9955abbdad8867c65de9fd2..de8c7aeaf268a4de25abd53cb86b95331c226330 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1932,9 +1932,10 @@ bool DoInstall(CommandLine &CmdL)
            {
               /* Skip if package is  installed already, or is about to be */
               string target = Start.TargetPkg().FullName(true) + " ";
            {
               /* Skip if package is  installed already, or is about to be */
               string target = Start.TargetPkg().FullName(true) + " ";

-              
-              if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install
-                  || Cache[Start.TargetPkg()].Install())
+              pkgCache::PkgIterator const TarPkg = Start.TargetPkg();
+              if (TarPkg->SelectedState == pkgCache::State::Install ||
+                  TarPkg->SelectedState == pkgCache::State::Hold ||
+                  Cache[Start.TargetPkg()].Install())

               {
                  foundInstalledInOrGroup=true;
                  break;
               {
                  foundInstalledInOrGroup=true;
                  break;

diff --git a/debian/changelog b/debian/changelog
index d206b1dd8efb6263fd84b7a34a9dbe78713e91e1..144d307fa6e6f98ba97939865eb532b643898cfd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ apt (0.7.26~exp4) UNRELEASED; urgency=low
     - show non-candidates as fallback for virtual packages (Closes: #578385)
     - set also "all" to this version for pseudo packages in TryToChangeVer
     - rerun dpkg-source in source if --fix-broken is given (Closes: #576752)
     - show non-candidates as fallback for virtual packages (Closes: #578385)
     - set also "all" to this version for pseudo packages in TryToChangeVer
     - rerun dpkg-source in source if --fix-broken is given (Closes: #576752)

+    - don't suggest held packages as they are installed (Closes: #578135)

   * apt-pkg/deb/dpkgpm.cc:
     - remove Chroot-Directory from files passed to install commands.
       Thanks to Kel Modderman for report & patch! (Closes: #577226)
   * apt-pkg/deb/dpkgpm.cc:
     - remove Chroot-Directory from files passed to install commands.
       Thanks to Kel Modderman for report & patch! (Closes: #577226)