This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=5fce4747ab4050d06a572107df338fde85479e31 commit 5fce4747ab4050d06a572107df338fde85479e31 Author: Guillem Jover <[email protected]> AuthorDate: Tue Aug 28 02:37:18 2018 +0200 test: Delete fixup lines from i18nspector output instead of emptying them The previous regex was just turning the line into an empty one, but we count the length to check whether there was any output. In this particular case this did not trigger because we have a chomp, that would get rid of the last empty line, which happened to be fine as we currently only emit one such empty line per file. But this is not future-proof, so let's fix it before it bites us. --- debian/changelog | 1 + t/po.t | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97ed4d959..79b849ab9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -277,6 +277,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Add support for new test_get_srcdir() test_get_builddir(). - Add new unit tests for namevalue, fsys-hash and pkg-hash libdpkg modules. - Improve coverage of perl unit tests. + - Delete fixup lines from i18nspector output instead of emptying them. [ Updated programs translations ] * Dutch (Frans Spiesschaert). Closes: #881401 diff --git a/t/po.t b/t/po.t index d2c01bd3f..8f2b7a8b7 100644 --- a/t/po.t +++ b/t/po.t @@ -33,8 +33,8 @@ sub po_ok { my $tags = qx(i18nspector \"$file\" 2>&1); # Fixup the output: - $tags =~ s/^.*\.pot: boilerplate-in-initial-comments .*$//mg; - $tags =~ s/^.*\.po: duplicate-header-field X-POFile-SpellExtra$//mg; + $tags =~ s/^.*\.pot: boilerplate-in-initial-comments .*\n//mg; + $tags =~ s/^.*\.po: duplicate-header-field X-POFile-SpellExtra\n//mg; chomp $tags; my $ok = length $tags == 0; -- Dpkg.Org's dpkg
