The following commit has been merged in the master branch:
commit bc31b590e44bde6a7c1433fbfe62e7fffa64e7d0
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat May 24 08:42:34 2008 +0300
dpkg-trigger: Remove duplicate program name from badusage output
diff --git a/ChangeLog b/ChangeLog
index 24219ab..5f2806c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-24 Guillem Jover <[EMAIL PROTECTED]>
+
+ * src/trigcmd.c (main): Remove duplicate program name from badusage.
+
2008-05-19 Martin Koeppe <[EMAIL PROTECTED]>,
Guillem Jover <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index c288900..fb8136e 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 eea5fa2..73b3455 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;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
