Просмотр исходного кода

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

David Kalnischkies лет назад: 16
Родитель
Сommit
2d847a5919
2 измененных файлов с 5 добавлено и 3 удалено
  1. 4 3
      cmdline/apt-get.cc
  2. 1 0
      debian/changelog

+ 4 - 3
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) + " ";
-	       
-	       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;

+ 1 - 0
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)
+    - 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)