浏览代码

Fix inversion test of $state against 'expected' when removing an
alternative.

Adam Heath 23 年之前
父节点
当前提交
f9e58d0dbc
共有 3 个文件被更改,包括 9 次插入1 次删除
  1. 5 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 1 1
      scripts/update-alternatives.pl

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Sat Sep 13 14:34:10 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/update-alternatives.pl: Fix inversion test of $state against
+    'expected' when removing an alternative.
+
 Sat Sep 13 14:31:22 CDT 2003 Adam Heath <doogie@debian.org>
 
   * lib/startup.c, lib/Makefile.in, include/dpkg.h.in: Change

+ 3 - 0
debian/changelog

@@ -9,6 +9,9 @@ dpkg (1.10.11) unstable; urgency=low
     #196361
   * Change standard_startup and standard_shutdown into macros.  Closes:
     #200351.
+  * Sebastian Ley <sebastian.ley@mmweg.rwth-aachen.de>:
+    Fix inversion test of $state against 'expected' when removing an
+    alternative.  Closes: #203791.
 
  -- Wichert Akkerman <debian@extern.wiggy.net>  UNRELEASED
 

+ 1 - 1
scripts/update-alternatives.pl

@@ -309,7 +309,7 @@ if ($mode eq 'install') {
 }
 
 if ($mode eq 'remove') {
-    if ($manual eq "manual" and $state ne "expected") {
+    if ($manual eq "manual" and $state eq "expected") {
     	&pr("Removing manually selected alternative - switching to auto mode");
 	$manual= "auto";
     }