summaryrefslogtreecommitdiff
path: root/src/query.c
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2006-06-02 03:45:21 +0000
committerGuillem Jover <guillem@debian.org>2006-06-02 03:45:21 +0000
commitad13d218499a7224fc8b5904014aac17da757a09 (patch)
treeebe6987f7835c560ba3b461ac4a4209b49d548aa /src/query.c
parent64dde93bd408ec661eefd9708a6803cbf23c394d (diff)
downloaddpkg-ad13d218499a7224fc8b5904014aac17da757a09.tar.gz
Disambiguate error message about conflicting command line actions by
providing both long and short option names. Based on a suggestion by Josip Rodin. Closes: #45575
Diffstat (limited to 'src/query.c')
-rw-r--r--src/query.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/query.c b/src/query.c
index f49a0990a..cc1324f09 100644
--- a/src/query.c
+++ b/src/query.c
@@ -541,7 +541,8 @@ static void versiononly(const struct cmdinfo *cip, const char *value) {
static void setaction(const struct cmdinfo *cip, const char *value) {
if (cipaction)
- badusage(_("conflicting actions --%s and --%s"),cip->olong,cipaction->olong);
+ badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"),
+ cip->oshort, cip->olong, cipaction->oshort, cipaction->olong);
cipaction= cip;
}