From 65d6f8835fb72d413643a13ed1621a323199a26b Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 18 Jan 2008 05:07:13 +0200 Subject: [PATCH] u-a: Remove unimplemented --test option Closes: #392432, #461247 --- ChangeLog | 8 ++++++++ debian/changelog | 2 ++ man/update-alternatives.8 | 4 ---- scripts/update-alternatives.pl | 4 ---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d44c49f..f2613576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-01-18 Guillem Jover + + * scripts/update-alternatives.pl: Stop parsing '--test' as a valid + option. + ($testmode): Remove variable. + (usage): Remove '--test' option help. + * man/update-alternatives.8: Remove '--test' documentation. + 2008-01-18 Guillem Jover * utils/start-stop-daemon.c (do_help): Add missing semicolon. diff --git a/debian/changelog b/debian/changelog index 271d0db6..734aada4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ dpkg (1.14.16) UNRELEASED; urgency=low * Check current uid and gid in start-stop-daemon before calling setuid, setgid and initgroups. Closes: #222524 Based on a patch by Samuel Thibault. + * Remove unimplemented --test option from update-alternatives. + Closes: #392432, #461247 [ Frank Lichtenheld ] * Make the -L option of dpkg-parsechangelog actually work (it's diff --git a/man/update-alternatives.8 b/man/update-alternatives.8 index a681ad36..6029c0a6 100644 --- a/man/update-alternatives.8 +++ b/man/update-alternatives.8 @@ -317,10 +317,6 @@ is doing. .B \-\-quiet Don't generate any comments unless errors occur. This option is not yet implemented. -.TP -.B \-\-test -Don't actually do anything, just say what would be done. -This option is not yet implemented. . .SH FILES .TP diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl index 07d12b91..edbbec8b 100755 --- a/scripts/update-alternatives.pl +++ b/scripts/update-alternatives.pl @@ -15,7 +15,6 @@ my $altdir = '/etc/alternatives'; # FIXME: this should not override the previous assignment. $admindir = $admindir . '/alternatives'; -my $testmode = 0; my $verbosemode = 0; my $action = ''; # Action to perform (display / install / remove / display / auto / config) @@ -97,7 +96,6 @@ Commands: Options: --altdir change the alternatives directory. --admindir change the administrative directory. - --test don't do anything, just demonstrate. --verbose verbose operation, more output. --quiet quiet operation, minimal output. --help show this help message. @@ -301,8 +299,6 @@ while (@ARGV) { &usage; exit(0); } elsif (m/^--version$/) { &version; exit(0); - } elsif (m/^--test$/) { - $testmode= 1; } elsif (m/^--verbose$/) { $verbosemode= +1; } elsif (m/^--quiet$/) { -- 2.39.5