u-a: Remove unimplemented --test option

Closes: #392432, #461247

diff --git a/ChangeLog b/ChangeLog
index 0d44c49faceb2dc54e807a8ffd507398c36889de..f2613576fc4762d85089ff58ef48793c39a52172 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-18  Guillem Jover  <guillem@debian.org>
+
+       * 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  <guillem@debian.org>
 
        * utils/start-stop-daemon.c (do_help): Add missing semicolon.

diff --git a/debian/changelog b/debian/changelog
index 271d0db613fe3cc458d4ac807df8b272f2f58cca..734aada43d3c63b329cb3b91785a63218791455a 100644 (file)
--- 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 a681ad3698798bedc1f08736dd498869bc05fef1..6029c0a66e7f5ad3bb4939b4fdd94d1f336e9ea5 100644 (file)
--- 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 07d12b91e7d8cb086540c5a12d2cbdc9886bd6a4..edbbec8bf889f4876c443543461245335e27a6a3 100755 (executable)
--- 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 <directory>     change the alternatives directory.
   --admindir <directory>   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$/) {