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=c6fe5807feb2b1fcddd56831af29183184db4f4a commit c6fe5807feb2b1fcddd56831af29183184db4f4a Author: Guillem Jover <[email protected]> AuthorDate: Sun Sep 16 11:41:18 2018 +0200 dpkg: Do not hardcode the program name in the --force-help output We will be using the same logic for other commands. --- debian/changelog | 1 + src/force.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6c5abb227..2b13af898 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - dpkg: Move SELinux fallback label to the SELinux specific code path. - dpkg: Simplify maintscript_set_exec_context(). - dpkg: Move force options support into its own file. + - dpkg: Do not hardcode the program name in the --force-help output. * Build system: - Check whether this dist is a release, based only on the version format. This will avoid having to do a two staged release to get a proper perl diff --git a/src/force.c b/src/force.c index ce0077e6f..13c53f3d6 100644 --- a/src/force.c +++ b/src/force.c @@ -250,7 +250,7 @@ set_force(const struct cmdinfo *cip, const char *value) "%s forcing options - control behaviour when problems found:\n" " warn but continue: --force-<thing>,<thing>,...\n" " stop with error: --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n" -" Forcing things:\n"), DPKG); +" Forcing things:\n"), dpkg_get_progname()); for (fip = forceinfos; fip->name; fip++) print_forceinfo(fip); -- Dpkg.Org's dpkg
