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

alternative.

diff --git a/ChangeLog b/ChangeLog
index 99c4cbabd64a0651024261dec49c9357238f5d84..be8736b16434a8101bf01534be1ae9496d231cb5 100644 (file)
--- a/ChangeLog
+++ b/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

diff --git a/debian/changelog b/debian/changelog
index 6eb083640f9da72b95732c3fcb9b9c5f29f4311b..f7c8ed253ccd78e3fa2f0d27ed89ec66f686ea30 100644 (file)
--- a/debian/changelog
+++ b/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
 

diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index 9f8a79f9a48702036536975a07afe6342d83eea8..09b41787837ff3ad2f290d1d0884ee0115747467 100755 (executable)
--- a/scripts/update-alternatives.pl
+++ b/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";
     }