This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch master
in repository dpkg.

commit 6675001502ece8e72c8b3853a76a9b248b91b295
Author: Guillem Jover <[email protected]>
Date:   Thu Apr 26 03:51:23 2018 +0200

    dpkg: Print the environment variables setup for the conffile shell
    
    Make these variables more discoverable by printing them as a list
    before spawning the conffile shell.
---
 debian/changelog | 2 ++
 src/configure.c  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f2a2ee0..1c45c41 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 <[email protected]>
diff --git a/src/configure.c b/src/configure.c
index 3c565c6..211663c 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();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/dpkg/dpkg.git

Reply via email to