This is an automated email from the git hooks/post-receive script.
dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.
commit 6a7337cbba652663d2cc9bcf8c6435eb1159bf2f
Author: Dominique Dumont <d...@debian.org>
Date: Sun Jan 24 12:22:46 2016 +0100
Copyright: Show a warning when fixing common keyword issues
This fixes tests that broke with Config::Model 2.077
---
lib/Config/Model/Backend/Dpkg/Copyright.pm | 6 +++---
t/model_tests.d/dpkg-copyright-test-conf.pl | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/Config/Model/Backend/Dpkg/Copyright.pm
b/lib/Config/Model/Backend/Dpkg/Copyright.pm
index 0654a95..deb5883 100644
--- a/lib/Config/Model/Backend/Dpkg/Copyright.pm
+++ b/lib/Config/Model/Backend/Dpkg/Copyright.pm
@@ -73,7 +73,7 @@ sub read {
# Some people use 'File' to declare copyright info for a single file.
# While this is correct grammatically, it tends to be PITA
if (my $file_section = delete $section{file}) {
- $logger->warn("Found File section. This one is converted in Files
section (mind the plural)");
+ warn("copyright line $section_line: section 'File' is converted in
'Files' section (mind the plural)\n");
$file_section->[2] = 'changed file section into files section' ;
$section{files} //= $file_section ; # no clobber of good section
}
@@ -94,7 +94,7 @@ sub read {
}
if (defined $section{licence}) {
- $logger->warn("Found UK spelling for license. It will be converted
to US spelling");
+ warn("copyright line $section_line: Converting UK spelling for
license in US spelling\n");
$section{license} = delete $section{licence} ;# FIXME: use
notify_change
$section{license}[2] = 'changed uk spelling for license (was
licence)'; # is altered
}
@@ -141,7 +141,7 @@ sub read {
parsed_line => $section_line
);
}
- $logger->warn("Dropping unknown paragraph from section $section_nb
line $section_line");
+ $logger->warn("copyright line $section_line: Dropping unknown
paragraph");
}
}
diff --git a/t/model_tests.d/dpkg-copyright-test-conf.pl
b/t/model_tests.d/dpkg-copyright-test-conf.pl
index a4dbc5b..8b93a8b 100644
--- a/t/model_tests.d/dpkg-copyright-test-conf.pl
+++ b/t/model_tests.d/dpkg-copyright-test-conf.pl
@@ -126,7 +126,7 @@ $skip = ( $@ or not -r '/etc/debian_version') ? 1 : 0 ;
},
},
{ # t10
- load_warnings => [ (qr/deprecated/) x 2 ],
+ load_warnings => [ (qr/UK spelling/) x 4, (qr/deprecated/) x 2 ],
check => {
Format =>
"https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/";,
@@ -247,7 +247,7 @@ in ‘/usr/share/common-licenses/GPL-1’.",
name => 'file-instead-of-files' ,
# warning brought by fix of Debian #789568
- load_warnings => [ qr/confusingly close/ ],
+ load_warnings => [ qr/section 'File' is converted in 'Files'/ ],
check => {
"Files:debian/patches/half_code_pod_errors.patch Copyright" =>
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
