Explorar el Código

When a package is on hold, -E will not skip the same version when
installing.

Adam Heath hace 25 años
padre
commit
e43fcaf48f
Se han modificado 3 ficheros con 8 adiciones y 1 borrados
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 1
      main/archives.c

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Sun Jul  1 16:12:30 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * main/archives.c: When a package is on hold, -E will not skip the same
+    version when installing.
+
 Sat Jun 30 01:48:15 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * doc/ru/*: Added Russian translations from Alexey Mahotkin

+ 2 - 0
debian/changelog

@@ -3,6 +3,8 @@ dpkg (1.10) unstable; urgency=low
   * Fixed upper/lowercase problems with package names. Closes: Bug#58091
     (and 3 others).
   * Add Russian manual pages
+  * When a package is set to hold, and a reinstallation is requested,
+    -E will not properly skip it.  Closes: #45787.
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

+ 1 - 1
main/archives.c

@@ -937,7 +937,7 @@ int wanttoinstall(struct pkginfo *pkg, const struct versionrevision *ver, int sa
   enum versiondisplayepochwhen needepochs;
   int r;
 
-  if (pkg->want != want_install) {
+  if (pkg->want != want_install && pkg->want != want_hold) {
     if (f_alsoselect) {
       if (saywhy) {
    printf(_("Selecting previously deselected package %s.\n"),pkg->name);