From: Guillem Jover <guillem@debian.org>
Date: Sat, 24 May 2008 05:42:34 +0000 (+0300)
Subject: dpkg-trigger: Remove duplicate program name from badusage output
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc31b590e44bde6a7c1433fbfe62e7fffa64e7d0;p=dpkg

dpkg-trigger: Remove duplicate program name from badusage output
---

diff --git a/ChangeLog b/ChangeLog
index 24219abc..5f2806c9 100644
--- a/ChangeLog
+++ b/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>
 
diff --git a/debian/changelog b/debian/changelog
index c2889006..fb8136e6 100644
--- a/debian/changelog
+++ b/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
diff --git a/src/trigcmd.c b/src/trigcmd.c
index eea5fa29..73b34559 100644
--- a/src/trigcmd.c
+++ b/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;