[SCM] Debian package checker branch, master, updated. 2.3.4-107-g4e950a9
The following commit has been merged in the master branch:
commit aa7162c67c74605235c5338ea39deb403fb2f4bc
Author: Raphael Geissert <atomo64@gmail.com>
Date: Mon Apr 12 12:12:44 2010 -0500
Skip tags output validation based on output format instead of sorting
Introduces the Output-Format desc file field. Based on it decide
whether lintian's output (i.e. tags) should be validated.
This allows sorting non-EWI output formats without leading to
output format validation errors.
diff --git a/t/runtests b/t/runtests
index fcf03f6..d347a96 100755
--- a/t/runtests
+++ b/t/runtests
@@ -495,7 +495,7 @@ sub test_package {
# since in that case we probably have non-standard output.
my %test_for = map { $_ => 1 } split(' ', $testdata->{'test-for'});
my %test_against = map { $_ => 1 } split(' ', $testdata->{'test-against'});
- if (not %test_for and not %test_against and not $testdata->{sort}) {
+ if (not %test_for and not %test_against and $testdata->{'output-format'} ne 'EWI') {
if ($testdata->{'todo'} eq 'yes') {
print "E: marked as TODO but succeeded.\n";
return;
@@ -768,6 +768,7 @@ sub check_test_is_sane {
$data->{section} ||= 'devel';
$data->{'standards_version'} ||= $STANDARDS_VERSION;
$data->{sort} = ($data->{sort} and $data->{sort} eq 'no') ? 0 : 1;
+ $data->{'output-format'} ||= 'EWI';
$data->{'test-for'} ||= '';
$data->{'test-against'} ||= '';
--
Debian package checker
Reply to: