From: Adam Heath Date: Sat, 13 Sep 2003 19:34:45 +0000 (+0000) Subject: Fix inversion test of $state against 'expected' when removing an X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9e58d0dbc534320dbe0ff941c0f5c88f178287a;p=dpkg Fix inversion test of $state against 'expected' when removing an alternative. --- diff --git a/ChangeLog b/ChangeLog index 99c4cbab..be8736b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 13 14:34:10 CDT 2003 Adam Heath + + * 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 * lib/startup.c, lib/Makefile.in, include/dpkg.h.in: Change diff --git a/debian/changelog b/debian/changelog index 6eb08364..f7c8ed25 100644 --- 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 : + Fix inversion test of $state against 'expected' when removing an + alternative. Closes: #203791. -- Wichert Akkerman UNRELEASED diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl index 9f8a79f9..09b41787 100755 --- 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"; }