dpkg-trigger: Remove duplicate program name from badusage output

diff --git a/ChangeLog b/ChangeLog
index 24219abc44b320014850cdb150a86eb9873df72a..5f2806c902e7180aa12d76d278d8f1b707cee272 100644 (file)
--- 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 c2889006040ea3d1c400c0e776af6cc2744ba303..fb8136e60e0935efd22098c5522f4d9311b67b74 100644 (file)
--- 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 eea5fa2954e58324b142fcc0c40d9339b05a1ed4..73b34559bf277cd52a3c0fa308f8ea2eaaf9658a 100644 (file)
--- 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;