Просмотр исходного кода

Make similar messages be exactly similar

Christian Perrier лет назад: 20
Родитель
Сommit
9ac1172b69
3 измененных файлов с 5 добавлено и 3 удалено
  1. 3 1
      debian/changelog
  2. 1 1
      scripts/dpkg-divert.pl
  3. 1 1
      scripts/dpkg-statoverride.pl

+ 3 - 1
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
 

+ 1 - 1
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])); }

+ 1 - 1
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}) {