This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=e3e405a8c49ffa38a1b3290b1c04ca4eeb17600c commit e3e405a8c49ffa38a1b3290b1c04ca4eeb17600c Author: Guillem Jover <[email protected]> AuthorDate: Thu Jun 25 12:08:18 2020 +0200 Unify ellipsis formatting in programs --help output --- debian/changelog | 1 + dpkg-deb/main.c | 6 +++--- src/divertcmd.c | 2 +- src/main.c | 10 +++++----- src/querycmd.c | 2 +- src/statcmd.c | 6 +++--- src/trigcmd.c | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index d77175958..604e313aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ dpkg (1.20.1) UNRELEASED; urgency=medium Reported by Paul Wise <[email protected]>. * dpkg: Add a new --robot option to be used with --version. * dpkg, dpkg-query: Document missing options in --help output. + * Unify ellipsis formatting in programs --help output. * Portability: - libdpkg: When using uselocale(), include <xlocale.h> for locale_t if the header is available. Needed on BSDs. diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c index 3420e44b7..17ed92b18 100644 --- a/dpkg-deb/main.c +++ b/dpkg-deb/main.c @@ -65,16 +65,16 @@ static void DPKG_ATTR_NORET usage(const struct cmdinfo *cip, const char *value) { printf(_( -"Usage: %s [<option> ...] <command>\n" +"Usage: %s [<option>...] <command>\n" "\n"), BACKEND); printf(_( "Commands:\n" " -b|--build <directory> [<deb>] Build an archive.\n" " -c|--contents <deb> List contents.\n" -" -I|--info <deb> [<cfile> ...] Show info to stdout.\n" +" -I|--info <deb> [<cfile>...] Show info to stdout.\n" " -W|--show <deb> Show information on package(s)\n" -" -f|--field <deb> [<cfield> ...] Show field(s) to stdout.\n" +" -f|--field <deb> [<cfield>...] Show field(s) to stdout.\n" " -e|--control <deb> [<directory>] Extract control info.\n" " -x|--extract <deb> <directory> Extract files.\n" " -X|--vextract <deb> <directory> Extract & list files.\n" diff --git a/src/divertcmd.c b/src/divertcmd.c index dfc1c9033..e4bf3b58c 100644 --- a/src/divertcmd.c +++ b/src/divertcmd.c @@ -82,7 +82,7 @@ static void usage(const struct cmdinfo *cip, const char *value) { printf(_( -"Usage: %s [<option> ...] <command>\n" +"Usage: %s [<option>...] <command>\n" "\n"), dpkg_get_progname()); printf(_( diff --git a/src/main.c b/src/main.c index f5c4e007b..9b4fc5a04 100644 --- a/src/main.c +++ b/src/main.c @@ -82,7 +82,7 @@ static void DPKG_ATTR_NORET usage(const struct cmdinfo *ci, const char *value) { printf(_( -"Usage: %s [<option> ...] <command>\n" +"Usage: %s [<option>...] <command>\n" "\n"), DPKG); printf(_( @@ -164,11 +164,11 @@ usage(const struct cmdinfo *ci, const char *value) " --status-fd <n> Send status change updates to file descriptor <n>.\n" " --status-logger=<command> Send status change updates to <command>'s stdin.\n" " --log=<filename> Log status changes and actions to <filename>.\n" -" --ignore-depends=<package>,...\n" +" --ignore-depends=<package>[,...]\n" " Ignore dependencies involving <package>.\n" -" --force-... Override problems (see --force-help).\n" -" --no-force-...|--refuse-...\n" -" Stop when problems encountered.\n" +" --force-<thing>[,...] Override problems (see --force-help).\n" +" --no-force-<thing>[,...] Stop when problems encountered.\n" +" --refuse-<thing>[,...] Ditto.\n" " --abort-after <n> Abort after encountering <n> errors.\n" " --robot Use machine-readable output on some commands.\n" "\n"), ADMINDIR); diff --git a/src/querycmd.c b/src/querycmd.c index 2b878c894..427e635c7 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -786,7 +786,7 @@ static void DPKG_ATTR_NORET usage(const struct cmdinfo *ci, const char *value) { printf(_( -"Usage: %s [<option> ...] <command>\n" +"Usage: %s [<option>...] <command>\n" "\n"), DPKGQUERY); printf(_( diff --git a/src/statcmd.c b/src/statcmd.c index 2507b31be..8e87c7107 100644 --- a/src/statcmd.c +++ b/src/statcmd.c @@ -90,9 +90,9 @@ usage(const struct cmdinfo *cip, const char *value) " --root <directory> set the directory of the root filesystem.\n" " --update immediately update <path> permissions.\n" " --force deprecated alias for --force-all.\n" -" --force-... override problems (see --force-help).\n" -" --no-force-... stop when problems encountered.\n" -" --refuse-... ditto.\n" +" --force-<thing>[,...] override problems (see --force-help).\n" +" --no-force-<thing>[,...] stop when problems encountered.\n" +" --refuse-<thing>[,...] ditto.\n" " --quiet quiet operation, minimal output.\n" " --help show this help message.\n" " --version show the version.\n" diff --git a/src/trigcmd.c b/src/trigcmd.c index 7c547a3bf..0a3b4937d 100644 --- a/src/trigcmd.c +++ b/src/trigcmd.c @@ -63,8 +63,8 @@ static void DPKG_ATTR_NORET usage(const struct cmdinfo *ci, const char *value) { printf(_( -"Usage: %s [<options> ...] <trigger-name>\n" -" %s [<options> ...] <command>\n" +"Usage: %s [<option>...] <trigger-name>\n" +" %s [<option>...] <command>\n" "\n"), dpkg_get_progname(), dpkg_get_progname()); printf(_( -- Dpkg.Org's dpkg
