[lintian] 02/03: p/gen-tag-summary: Make a bit more robust/verbose
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit a9c99cbeb60c3b0b4006a8cfbf364dfe1bdedc24
Author: Niels Thykier <niels@thykier.net>
Date: Sat Aug 13 19:57:45 2016 +0000
p/gen-tag-summary: Make a bit more robust/verbose
Signed-off-by: Niels Thykier <niels@thykier.net>
---
private/generate-tag-summary | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/private/generate-tag-summary b/private/generate-tag-summary
index 68c0fb2..517d1fc 100755
--- a/private/generate-tag-summary
+++ b/private/generate-tag-summary
@@ -13,7 +13,7 @@ use lib "$ENV{'LINTIAN_ROOT'}/lib/";
use Lintian::Command qw(safe_qx);
my $RE = qr{
- \A [ ] [ ] XXX: [ ] generate [ ] tag [ ] summary
+ \A [ ]{2,} XXX: [ ] generate [ ] tag [ ] summary
[ ] with [ ] private/generate-tag-summary \n \Z
}xsm;
my (%added, %removed, %opt);
@@ -40,6 +40,7 @@ if (not $commit_range) {
}
$describe =~ s/-\d+-g[0-9a-fA-F]{7}$//;
$commit_range = "${describe}..HEAD";
+ print "Assuming commit range to be: ${commit_range}\n";
}
open(my $fd, '-|', 'git', 'diff', $commit_range, '--', 'checks/*.desc');
@@ -69,17 +70,22 @@ if (not %added and not %removed) {
}
if ($opt{'in-place'}) {
+ my $matched = 0;
open(my $in_fd, '<', 'debian/changelog');
open(my $out_fd, '>', 'debian/changelog.tmp');
while (my $line = <$in_fd>) {
if ($line =~ m/$RE/o) {
emit_tag_summary($out_fd);
+ $matched++;
} else {
print {$out_fd} $line;
}
}
close($out_fd);
close($in_fd);
+ if ($matched != 1) {
+ die("changelog did not match $RE exactly once\n");
+ }
rename('debian/changelog.tmp', 'debian/changelog');
print "Updated debian/changelog\n";
} else {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: