[debhelper-devel] [debhelper] 01/01: Dh_Lib: Export an env var before running +x scripts

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit e2a802bf5365ce05e5270592dfa95240499d98ed
Author: Gergely Nagy <algernon at madhouse-project.org>
Date:   Wed Sep 23 10:12:43 2015 +0200

    Dh_Lib: Export an env var before running +x scripts
    
    In order to let executable scripts discover what package is being built,
    so they can avoid side-effects in case a package is to be skipped,
    export DH_CONFIG_ACT_ON_PACKAGES before running them.
    
    This, along with changes to dh-exec, will close #698054.
    
    Signed-off-by: Gergely Nagy <algernon at madhouse-project.org>
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 2 ++
 debian/changelog           | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index a5743e9..af3b3ac 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -760,7 +760,9 @@ sub filedoublearray {
 	if ($x) {
 		require Cwd;
 		my $cmd=Cwd::abs_path($file);
+		$ENV{"DH_CONFIG_ACT_ON_PACKAGES"} = join(",", @{$dh{"DOPACKAGES"}});
 		open (DH_FARRAY_IN, "$cmd |") || error("cannot run $file: $!");
+		delete $ENV{"DH_CONFIG_ACT_ON_PACKAGES"};
 	}
 	else {
 		open (DH_FARRAY_IN, $file) || error("cannot read $file: $!");
diff --git a/debian/changelog b/debian/changelog
index 664faff..c0b8981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,11 @@ debhelper (9.20150811+unreleased) UNRELEASED; urgency=medium
   * dh_compress: Apply patch from Rafael Kitover to support
     passing files to dh_compress that would have been
     compressed anyway.  (Closes: #794898)
+  * Dh_Lib: Apply patch from Gergely Nagy to make debhelper
+    export "DH_CONFIG_ACT_ON_PACKAGES" when executing an
+    executable debhelper config file.  This is intended to
+    assist dh-exec (etc.) in figuring what packages are
+    acted on.  (Closes: #698054)
 
   [ Paul Tagliamonte ]
   * dh_gencontrol: Put debug debs back in the "debug" section.

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