This is an automated email from the git hooks/post-receive script.
periapt pushed a commit to branch master
in repository license-reconcile.
commit 514f5cdaac6f26838f0f940e2397b857f760c7d1
Author: Nicholas Bamber <nicholas@leonhartsberger>
Date: Mon Oct 26 18:09:13 2015 +0000
working on t/18-app.txt
---
debian/TODO | 4 ++++
debian/changelog | 10 ++++++++++
debian/control | 4 ++--
lib/Debian/LicenseReconcile/Filter/Rules.pm | 2 +-
lib/Debian/LicenseReconcile/LicenseCheck.pm | 4 ++--
t/18-app.t | 9 ++++++---
6 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..749cfec
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,4 @@
+1. D::LR::check does not document return value
+2. What is Default~Std?
+3. Errors is poorly documented
+4. Incautious exists testing of data structures
diff --git a/debian/changelog b/debian/changelog
index ab5c2c5..dcf2083 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
license-reconcile (0.8) UNRELEASED; urgency=medium
+ * Team upload
+
+ [ gregor herrmann ]
* Rename autopkgtest configuration file(s) as per new pkg-perl-
autopkgtest schema.
+ [ Nicholas Bamber ]
+ * Fixed spelling errors
+ * Changes in how licensecheck is handled (Closes: #801609)
+ - Ignore warnings from licensecheck
+ - Add --text argument to licensechck invocation
+ - Increased dependency on devscripts to 2.15.9~
+
-- gregor herrmann <gre...@debian.org> Sat, 24 Oct 2015 13:47:24 +0200
license-reconcile (0.7) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index d5ec12e..c730b75 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Priority: optional
Build-Depends: debhelper (>= 9),
libmodule-build-perl,
perl (>= 5.18)
-Build-Depends-Indep: devscripts (>= 2.15.6),
+Build-Depends-Indep: devscripts (>= 2.15.9~),
libclass-xsaccessor-perl,
libconfig-any-perl,
libdebian-copyright-perl (>= 0.2),
@@ -38,7 +38,7 @@ Package: license-reconcile
Architecture: all
Depends: ${misc:Depends},
${perl:Depends},
- devscripts,
+ devscripts (>= 2.15.9~),
libclass-xsaccessor-perl,
libconfig-any-perl,
libdebian-copyright-perl (>= 0.2),
diff --git a/lib/Debian/LicenseReconcile/Filter/Rules.pm
b/lib/Debian/LicenseReconcile/Filter/Rules.pm
index 5db2357..e1181fc 100644
--- a/lib/Debian/LicenseReconcile/Filter/Rules.pm
+++ b/lib/Debian/LicenseReconcile/Filter/Rules.pm
@@ -101,7 +101,7 @@ assumed to contain a sequence of years and the copyright
holder. The regular
expression will be enclosed in C<m{....}xms>. Also it supports an additional
shorthand C<\Y> which represents a year followed by various separators.
-=item CopyrightClean (optional) - Gives a regular exprression that is replaced
+=item CopyrightClean (optional) - Gives a regular expression that is replaced
in the copyright string by a single space.
=back
diff --git a/lib/Debian/LicenseReconcile/LicenseCheck.pm
b/lib/Debian/LicenseReconcile/LicenseCheck.pm
index b96bdc6..9e6e1ab 100644
--- a/lib/Debian/LicenseReconcile/LicenseCheck.pm
+++ b/lib/Debian/LicenseReconcile/LicenseCheck.pm
@@ -36,7 +36,7 @@ Readonly my %LICENSE_MAPPING => (
'BSD (3 clause)' => 'BSD-3-clause',
);
-Readonly my $SCRIPT => '/usr/bin/licensecheck --no-conf';
+Readonly my $SCRIPT => '/usr/bin/licensecheck --no-conf --text';
Readonly my $PARSE_RE => qr{
^ # beginning of line
@@ -144,7 +144,7 @@ sub _get_raw_data {
$commands .= ' --recursive';
}
$commands .= " $subject" ;
- my $output = `$commands`;
+ my $output = `$commands 2> /dev/null`;
while ($output =~ /$PARSE_RE/g) {
my $file = substr($1, 1+length $self->{directory});
$self->{raw}->{$file} = {
diff --git a/t/18-app.t b/t/18-app.t
index 6847bf2..2871c13 100644
--- a/t/18-app.t
+++ b/t/18-app.t
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-use Test::More tests => 41;
+use Test::More tests => 44;
use Test::Deep;
use Test::Output;
use Test::NoWarnings;
@@ -120,6 +120,7 @@ my $app10 = Debian::LicenseReconcile::App->new(
directory=>'t/data/example',
display_mapping => 1,
);
+is(Debian::LicenseReconcile::Errors->how_many,2,'how many');
isa_ok($app10, 'Debian::LicenseReconcile::App');
my $target10 = undef;
my $expected = 'a/0.h: a/*.h
@@ -142,6 +143,7 @@ stdout_is(sub {
}, $expected);
cmp_deeply($target10, $target9);
+is(Debian::LicenseReconcile::Errors->how_many,2,'how many');
my $app11 = Debian::LicenseReconcile::App->new(
copyright=>'t/data/example/debian/copyright',
format_spec=>1,
@@ -155,6 +157,7 @@ my $app11 = Debian::LicenseReconcile::App->new(
);
isa_ok($app11, 'Debian::LicenseReconcile::App');
is($app11->run, 1, 'exit status');
+is(Debian::LicenseReconcile::Errors->how_many,11,'how many');
@list = Debian::LicenseReconcile::Errors->list;
cmp_deeply(\@list, bag(
$DLR_ERROR1,
@@ -163,8 +166,8 @@ cmp_deeply(\@list, bag(
$DLR_ERROR4,
$DLR_ERROR5,
$DLR_ERROR6,
- $DLR_ERROR7,
- $DLR_ERROR8,
+# $DLR_ERROR7,
+# $DLR_ERROR8,
$DLR_ERROR9,
$DLR_ERROR10,
));
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/license-reconcile.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
