Kaynağa Gözat

dpkg-trigger: Remove duplicate program name from badusage output

Guillem Jover 18 yıl önce
ebeveyn
işleme
bc31b590e4
3 değiştirilmiş dosya ile 8 ekleme ve 3 silme
  1. 4 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 3 3
      src/trigcmd.c

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+2008-05-24  Guillem Jover  <guillem@debian.org>
+
+	* src/trigcmd.c (main): Remove duplicate program name from badusage.
+
 2008-05-19  Martin Koeppe  <mkoeppe@gmx.de>,
             Guillem Jover  <guillem@debian.org>
 

+ 1 - 0
debian/changelog

@@ -9,6 +9,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low
     Based on a patch by Ben Finney.
   * Fix link order when using libcompat.a and libintl.a by placing them after
     libdpkg.a. Based on a patch by Martin Koeppe. Closes: #481805
+  * Remove duplicate program name from dpkg-trigger badusage output.
 
   [ Raphael Hertzog ]
   * Enhance dpkg-shlibdeps's error message when a library can't be found to

+ 3 - 3
src/trigcmd.c

@@ -187,12 +187,12 @@ main(int argc, const char *const *argv)
 
 	if (f_check) {
 		if (*argv)
-			badusage(_("dpkg-trigger --check-supported takes no arguments"));
+			badusage(_("--check-supported takes no arguments"));
 		do_check();
 	}
 
 	if (!*argv || argv[1])
-		badusage(_("dpkg-trigger takes one argument, the trigger name"));
+		badusage(_("takes one argument, the trigger name"));
 
 	if (!bypackage) {
 		bypackage = getenv(MAINTSCRIPTPKGENVVAR);
@@ -207,7 +207,7 @@ main(int argc, const char *const *argv)
 
 	activate = argv[0];
 	if ((badname = illegal_triggername(activate)))
-		badusage(_("dpkg-trigger: invalid trigger name `%.250s': %.250s"),
+		badusage(_("invalid trigger name `%.250s': %.250s"),
 		         activate, badname);
 
 	trigdef = &tdm_add;