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=4b1b8a20f00a97b1e8e3e9e7ba0183e8f6f0059e commit 4b1b8a20f00a97b1e8e3e9e7ba0183e8f6f0059e Author: Guillem Jover <[email protected]> AuthorDate: Wed Nov 14 04:26:21 2018 +0100 dpkg: Fix --help output to clarify optional arguments --- debian/changelog | 1 + src/main.c | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6b223549f..2a756508f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium breaking level, so to avoid generating artificial trigger cycles, when we end up trying to process triggers with yet unsatisifiable dependencies. Closes: #810724, #854478, #911620 + * dpkg: Fix --help output, to clarify which arguments are optional. * Perl modules: - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056 Thanks to Chris Lamb <[email protected]> for initial test cases. diff --git a/src/main.c b/src/main.c index df03d2371..fc5804beb 100644 --- a/src/main.c +++ b/src/main.c @@ -83,27 +83,27 @@ usage(const struct cmdinfo *ci, const char *value) printf(_( "Commands:\n" -" -i|--install <.deb file name> ... | -R|--recursive <directory> ...\n" -" --unpack <.deb file name> ... | -R|--recursive <directory> ...\n" -" -A|--record-avail <.deb file name> ... | -R|--recursive <directory> ...\n" -" --configure <package> ... | -a|--pending\n" -" --triggers-only <package> ... | -a|--pending\n" -" -r|--remove <package> ... | -a|--pending\n" -" -P|--purge <package> ... | -a|--pending\n" -" -V|--verify <package> ... Verify the integrity of package(s).\n" -" --get-selections [<pattern> ...] Get list of selections to stdout.\n" +" -i|--install <.deb file name>... | -R|--recursive <directory>...\n" +" --unpack <.deb file name>... | -R|--recursive <directory>...\n" +" -A|--record-avail <.deb file name>... | -R|--recursive <directory>...\n" +" --configure <package>... | -a|--pending\n" +" --triggers-only <package>... | -a|--pending\n" +" -r|--remove <package>... | -a|--pending\n" +" -P|--purge <package>... | -a|--pending\n" +" -V|--verify [<package>...] Verify the integrity of package(s).\n" +" --get-selections [<pattern>...] Get list of selections to stdout.\n" " --set-selections Set package selections from stdin.\n" " --clear-selections Deselect every non-essential package.\n" " --update-avail [<Packages-file>] Replace available packages info.\n" " --merge-avail [<Packages-file>] Merge with info from file.\n" " --clear-avail Erase existing available info.\n" " --forget-old-unavail Forget uninstalled unavailable pkgs.\n" -" -s|--status <package> ... Display package status details.\n" -" -p|--print-avail <package> ... Display available version details.\n" -" -L|--listfiles <package> ... List files 'owned' by package(s).\n" -" -l|--list [<pattern> ...] List packages concisely.\n" -" -S|--search <pattern> ... Find package(s) owning file(s).\n" -" -C|--audit [<package> ...] Check for broken package(s).\n" +" -s|--status [<package>...] Display package status details.\n" +" -p|--print-avail [<package>...] Display available version details.\n" +" -L|--listfiles <package>... List files 'owned' by package(s).\n" +" -l|--list [<pattern>...] List packages concisely.\n" +" -S|--search <pattern>... Find package(s) owning file(s).\n" +" -C|--audit [<package>...] Check for broken package(s).\n" " --yet-to-unpack Print packages selected for installation.\n" " --predep-package Print pre-dependencies to unpack.\n" " --add-architecture <arch> Add <arch> to the list of architectures.\n" -- Dpkg.Org's dpkg
