diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/configure.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index f2a2ee0e6..1c45c41c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium options. * Make dpkg-buildpackage validate OpenPGP signing key IDs length. Error out for short key IDs and warn for long key IDs. + * On the dpkg conffile prompt, print the set of environment variables setup + for the conffile shell, for easier discoverability. * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org> diff --git a/src/configure.c b/src/configure.c index 3c565c61d..211663c18 100644 --- a/src/configure.c +++ b/src/configure.c @@ -229,6 +229,10 @@ spawn_shell(const char *confold, const char *confnew) { pid_t pid; + fputs(_("Useful environment variables:\n"), stderr); + fputs(" - DPKG_SHELL_REASON\n", stderr); + fputs(" - DPKG_CONFFILE_OLD\n", stderr); + fputs(" - DPKG_CONFFILE_NEW\n", stderr); fputs(_("Type 'exit' when you're done.\n"), stderr); pid = subproc_fork(); |