[debhelper-devel] [debhelper] 01/01: Dh_Lib: Fix bug in autotrigger dup detection

[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 75bfc9d80569deca62b4547bb2921d704dfd413c
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Aug 21 20:19:27 2016 +0000

    Dh_Lib: Fix bug in autotrigger dup detection
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 2 +-
 debian/changelog           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index d1d381c..1cf280f 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -684,7 +684,7 @@ sub autoscript_sed {
 		open(my $ofd, '>', "${triggers_file}.new")
 			or error("open ${triggers_file}.new failed: $!");
 		while (my $line = <$ifd>) {
-			next if $line =~ m{\A  \Q${triggers_file}\E  \s+
+			next if $line =~ m{\A  \Q${triggers_type}\E  \s+
                                    \Q${trigger_target}\E (?:\s|\Z)
                               }x;
 			print {$ofd} $line;
diff --git a/debian/changelog b/debian/changelog
index 613a138..4e69b3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ debhelper (9.20160814+unreleased) UNRELEASED; urgency=medium
     If you want to participate in beta testing of new compat
     levels, please review "man 7 debhelper" for more
     information.
+  * Dh_Lib.pm: Fix bug in detection of existing auto-trigger.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 14 Aug 2016 09:30:15 +0000
 

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