Make similar messages be exactly similar

diff --git a/debian/changelog b/debian/changelog
index 8bfda9bec3bb928dd52a52ea8766c3453a3f0d94..12b6cc6b96bf67c9b14847147a6b169d10b7999e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,8 +36,10 @@ dpkg (1.13.22~) UNRELEASED; urgency=low
   [ Christian Perrier ]
   * Typo fix in update-alternatives ("alternativse"). Thanks to Eddy Petrisor
     for spotting it. Translations unfuzzied
+  * Make similar messages in dpkg-statoverride and dpkg-divert exactly similar
+    Thanks to Eddy Petriso for spotting them, again
 
- -- Christian Perrier <bubulle@debian.org>  Sat, 17 Jun 2006 07:22:34 +0200
+ -- Christian Perrier <bubulle@debian.org>  Sat, 17 Jun 2006 07:31:42 +0200
 
 dpkg (1.13.21) unstable; urgency=low
 

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index b0f6ff239572c948c59be8d384d1d0c25c7ca5b8..f38249aae1f111f1e711c825863b20c5a233ac06 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -276,5 +276,5 @@ sub infoa { &infol($file,$divertto,$package); }
 sub infon { &infol($contest[$i],$altname[$i],$package[$i]); }
 
 sub quit { printf STDERR _g("dpkg-divert: %s")."\n", "@_"; exit(2); }
-sub badusage { printf STDERR _g("dpkg-divert: %s")."\n\n", "@_"; print(_g("You need --help").".\n"); exit(2); }
+sub badusage { printf STDERR _g("dpkg-divert: %s")."\n\n", "@_"; print(_g("You need --help.")."\n"); exit(2); }
 sub badfmt { &quit(sprintf(_g("internal error: %s corrupt: %s"), "$admindir/diversions", $_[0])); }

diff --git a/scripts/dpkg-statoverride.pl b/scripts/dpkg-statoverride.pl
index 86ed9e343758190f1aaafdc66a4137a39e58e345..fefc22654b9b8186dc07bc04bea679d2f9e53611 100755 (executable)
--- a/scripts/dpkg-statoverride.pl
+++ b/scripts/dpkg-statoverride.pl
@@ -141,7 +141,7 @@ if ($mode eq "add") {
            }
        }
 } elsif ($mode eq "remove") {
-       @ARGV==1 || &badusage(_g("--remove needs one arguments"));
+       @ARGV==1 || &badusage(_g("--remove needs a single argument"));
        $file=$ARGV[0];
        $file =~ s,/+$,, && print STDERR _g("stripping trailing /")."\n";
        if (not defined $owner{$file}) {