[devscripts] 03/18: debuild: Update documentation of preserved env variables

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit d9e277188e2d4b1ee3323b847192db02a1d52f82
Author: James McCoy <jamessan at debian.org>
Date:   Fri Sep 18 22:49:10 2015 -0400

    debuild: Update documentation of preserved env variables
    
    Also, remove preservation of DEBSIGN_* since those aren't actually
    environment variables that debsign uses.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 scripts/debuild.1  | 12 +++++++-----
 scripts/debuild.pl |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/debuild.1 b/scripts/debuild.1
index bd9b031..ff6ed01 100644
--- a/scripts/debuild.1
+++ b/scripts/debuild.1
@@ -86,11 +86,13 @@ PACKAGE-version.
 .SH ENVIRONMENT VARIABLES
 As environment variables can affect the building of a package, often
 unintentionally, \fBdebuild\fR sanitises the environment by removing
-all environment variables except for \fBTERM\fR, \fBHOME\fR, \fBLOGNAME\fR, \fBGNUPGHOME\fR,
-\fBPGPPATH\fR, \fBGPG_AGENT_INFO\fR, \fBDBUS_SESSION_BUS_ADDRESS\fR, \fBFAKEROOTKEY\fR, \fBDEB_\fI*\fR, the
-(\fBC\fR, \fBCPP\fR, \fBCXX\fR, \fBLD\fR and \fBF\fR)\fBFLAGS\fR variables and their \fB_APPEND\fR counterparts
-and the locale variables \fBLANG\fR and \fBLC_\fI*\fR.  \fBTERM\fR is set to `dumb' if it
-is unset, and \fBPATH\fR is set to "/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11".
+all environment variables except for \fBTERM\fR, \fBHOME\fR, \fBLOGNAME\fR,
+\fBGNUPGHOME\fR, \fBPGPPATH\fR, \fBGPG_AGENT_INFO\fR, \fBGPG_TTY\fR,
+\fBDBUS_SESSION_BUS_ADDRESS\fR, \fBFAKEROOTKEY\fR, \fBDEBEMAIL\fR,
+\fBDEB_\fI*\fR, the (\fBC\fR, \fBCPP\fR, \fBCXX\fR, \fBLD\fR and
+\fBF\fR)\fBFLAGS\fR variables and their \fB_APPEND\fR counterparts and the
+locale variables \fBLANG\fR and \fBLC_\fI*\fR.  \fBTERM\fR is set to `dumb'
+if it is unset, and \fBPATH\fR is set to "/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11".
 .PP
 If a particular environment variable is required to be passed through
 untouched to the build process, this may be specified by using a
diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index f3af843..b1bd4f6 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -614,7 +614,7 @@ foreach my $var (('DBUS_SESSION_BUS_ADDRESS', 'DISPLAY', 'GNOME_KEYRING_SOCKET',
 unless ($preserve_env) {
     foreach my $var (keys %ENV) {
 	delete $ENV{$var} unless
-	    $save_vars{$var} or $var =~ /^(LC|DEB(SIGN)?)_[A-Z_]+$/
+	    $save_vars{$var} or $var =~ /^(LC|DEB)_[A-Z_]+$/
 	    or $var =~ /^(C(PP|XX)?|LD|F)FLAGS(_APPEND)?$/;
     }
 }

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