Bug#686813: unblock: lintian/2.5.10.2 (pre-approval)
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi,
I am considering to upload another minor release of Lintian to
unstable with the following changes:
lintian (2.5.10.2) UNRELEASED; urgency=low
* checks/po-debconf:
+ [NT] Fix dirhandle leak.
* checks/source-copyright{,.desc}:
+ [NT] Report the correct line number for the use of commas in
the "Files" field in DEP-5 copyright files. Thanks to Faheem
Mitha for the report. (Closes: #683946)
+ [NT] Mention that syntax-error-in-dep5-copyright may hide
other issues as Lintian skips some DEP-5 checks in this case.
Thanks to Faheem Mitha for the report.
* frontend/lintian:
+ [NT] Fix typo of identifier method, which causes Lintian to
crash in case a "coll" cannot be started or it fails.
* lib/Lintian/Profile.pm:
+ [NT] Use "closedir" rather than "close" to close a dir
handle.
~Niels
unblock lintian/2.5.10.2
diff --git a/checks/po-debconf b/checks/po-debconf
index 5b6f52f..a21deac 100644
--- a/checks/po-debconf
+++ b/checks/po-debconf
@@ -162,6 +162,7 @@ while (defined(my $file=readdir(DEBIAN))) {
$full_translation = 1;
}
}
+closedir DEBIAN;
tag 'no-complete-debconf-translation' if !$full_translation;
diff --git a/checks/source-copyright b/checks/source-copyright
index fea9e44..c805590 100644
--- a/checks/source-copyright
+++ b/checks/source-copyright
@@ -199,7 +199,7 @@ if (@dep5) {
}
}
if ($commas_in_files) {
- tag 'comma-separated-files-in-dep5-copyright', 'paragraph at line', $lines[$i]
+ tag 'comma-separated-files-in-dep5-copyright', 'paragraph at line', $lines[$commas_in_files]
unless grep(/,/, $info->sorted_index);
}
while ((my $license, $i) = each %required_standalone_licenses) {
diff --git a/checks/source-copyright.desc b/checks/source-copyright.desc
index 4a6ff26..de859b4 100644
--- a/checks/source-copyright.desc
+++ b/checks/source-copyright.desc
@@ -74,6 +74,9 @@ Certainty: possible
Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: The machine-readable copyright file didn't pass Debian control file
syntax check.
+ .
+ This issue may hide other issues as Lintian skips some checks on the
+ file in this case.
Tag: obsolete-field-in-dep5-copyright
Severity: normal
diff --git a/debian/changelog b/debian/changelog
index b5ef9b2..e56b02e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+lintian (2.5.10.2) UNRELEASED; urgency=low
+
+ * checks/po-debconf:
+ + [NT] Fix dirhandle leak.
+ * checks/source-copyright{,.desc}:
+ + [NT] Report the correct line number for the use of commas in
+ the "Files" field in DEP-5 copyright files. Thanks to Faheem
+ Mitha for the report. (Closes: #683946)
+ + [NT] Mention that syntax-error-in-dep5-copyright may hide
+ other issues as Lintian skips some DEP-5 checks in this case.
+ Thanks to Faheem Mitha for the report.
+
+ * frontend/lintian:
+ + [NT] Fix typo of identifier method, which causes Lintian to
+ crash in case a "coll" cannot be started or it fails.
+
+ * lib/Lintian/Profile.pm:
+ + [NT] Use "closedir" rather than "close" to close a dir
+ handle.
+
+ -- Niels Thykier <niels@thykier.net> Thu, 06 Sep 2012 09:55:09 +0200
+
lintian (2.5.10.1) unstable; urgency=low
* checks/fields.desc:
diff --git a/frontend/lintian b/frontend/lintian
index ae9d4f2..7a9030c 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -1462,7 +1462,7 @@ sub unpack_group {
"skipping $action of $pkg_type package $pkg_name");
$exit_code = 2;
$group->remove_processable ($lpkg);
- delete $worklists{$proc->identifer};
+ delete $worklists{$proc->identifier};
# Lets not start any more jobs for this processable
last;
}
@@ -1491,7 +1491,7 @@ sub unpack_group {
$res = finished_coll ($key, $cmd, $jdata);
if ($res < 0) {
$group->remove_processable ($lpkg);
- delete $worklists{$lpkg->identifer};
+ delete $worklists{$lpkg->identifier};
next;
}
$newjobs += $res;
diff --git a/lib/Lintian/Profile.pm b/lib/Lintian/Profile.pm
index 817b000..5ca7348 100644
--- a/lib/Lintian/Profile.pm
+++ b/lib/Lintian/Profile.pm
@@ -517,7 +517,7 @@ sub _load_checks {
next unless $desc =~ s/\.desc$//o;
$self->_load_check($profile, $desc);
}
- close $dirfd;
+ closedir $dirfd;
}
=back
diff --git a/t/tests/source-copyright-dep5-general/tags b/t/tests/source-copyright-dep5-general/tags
index 3f1e1a7..9d43682 100644
--- a/t/tests/source-copyright-dep5-general/tags
+++ b/t/tests/source-copyright-dep5-general/tags
@@ -1,5 +1,5 @@
I: source-copyright-dep5-general source: unused-license-paragraph-in-dep5-copyright expat (paragraph at line 40)
-W: source-copyright-dep5-general source: comma-separated-files-in-dep5-copyright paragraph at line 40
+W: source-copyright-dep5-general source: comma-separated-files-in-dep5-copyright paragraph at line 8
W: source-copyright-dep5-general source: missing-field-in-dep5-copyright copyright (paragraph at line 15)
W: source-copyright-dep5-general source: missing-field-in-dep5-copyright license (paragraph at line 12)
W: source-copyright-dep5-general source: missing-license-paragraph-in-dep5-copyright mit (paragraph at line 18)
Reply to: