The branch, master has been updated
via 65d6f8835fb72d413643a13ed1621a323199a26b (commit)
from 27bf72335a6ca79c49a889d9ef65db07b9514463 (commit)
- Shortlog ------------------------------------------------------------
65d6f88 u-a: Remove unimplemented --test option
Summary of changes:
ChangeLog | 8 ++++++++
debian/changelog | 2 ++
man/update-alternatives.8 | 4 ----
scripts/update-alternatives.pl | 4 ----
4 files changed, 10 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 65d6f8835fb72d413643a13ed1621a323199a26b
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Fri Jan 18 05:07:13 2008 +0200
u-a: Remove unimplemented --test option
Closes: #392432, #461247
diff --git a/ChangeLog b/ChangeLog
index 0d44c49..f261357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-01-18 Guillem Jover <[EMAIL PROTECTED]>
+ * 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 <[EMAIL PROTECTED]>
+
* utils/start-stop-daemon.c (do_help): Add missing semicolon.
2008-01-17 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 271d0db..734aada 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 a681ad3..6029c0a 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 07d12b9..edbbec8 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 <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$/) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
