diff options
author | Niels Thykier <niels@thykier.net> | 2016-08-21 20:19:27 +0000 |
---|---|---|
committer | Niels Thykier <niels@thykier.net> | 2016-08-21 20:19:27 +0000 |
commit | 75bfc9d80569deca62b4547bb2921d704dfd413c (patch) | |
tree | c6cfdaf303cfbc181b7438d66d46e69777c217d1 | |
parent | 5fb2a15aff8b432ed33ba87c24da5c7e4734e1ce (diff) | |
download | debhelper-75bfc9d80569deca62b4547bb2921d704dfd413c.tar.gz |
Dh_Lib: Fix bug in autotrigger dup detection
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 2 | ||||
-rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index d1d381c2..1cf280f0 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 613a1385..4e69b3e0 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@thykier.net> Sun, 14 Aug 2016 09:30:15 +0000 |