[Reproducible-commits] [debhelper] 01/02: Dh_Lib: Respect --no-act in autotrigger

[Mattia Rizzolo]

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

mapreri-guest pushed a commit to branch master
in repository debhelper.

commit c6742f713668a9dadcf32d164b07701e3305a812
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Oct 5 08:13:26 2015 +0200

    Dh_Lib: Respect --no-act in autotrigger
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 3 ++-
 debian/changelog           | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index af3b3ac..c2ff47b 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -646,6 +646,7 @@ sub autoscript_sed {
 			require Carp;
 			confess("Invalid/unknown trigger ${trigger_type}");
 		}
+		return if $dh{NO_ACT};
 
 		$triggers_file = generated_file($package, 'triggers');
 		if ( -f $triggers_file ) {
@@ -656,7 +657,7 @@ sub autoscript_sed {
 				or error("open /dev/null failed $!");
 		}
 		open(my $ofd, '>', "${triggers_file}.new")
-			or error("open ${triggers_file}.new failed $!");
+			or error("open ${triggers_file}.new failed: $!");
 		while (my $line = <$ifd>) {
 			next if $line =~ m{\A  \Q${triggers_file}\E  \s+
                                    \Q${trigger_target}\E (?:\s|\Z)
diff --git a/debian/changelog b/debian/changelog
index 5ea99c2..a3cccb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ debhelper (9.20151004+unreleased) UNRELEASED; urgency=medium
 
   * dh_strip: Sort build-ids to make the Build-Ids header
     reproducible.
+  * Dh_Lib.pm: Respect --no-act in autotrigger, thanks to
+    Andreas Henriksson and Helmut Grohne for reporting
+    the issue.  (Closes: #800919)
 
  -- Niels Thykier <niels at thykier.net>  Sun, 04 Oct 2015 20:50:41 +0200
 

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