Bug#862368: scan-copyrights fails to consolidate when licensecheck doesn't report years

[Dominique Dumont]

On Sunday, 14 May 2017 19:48:32 CEST Paul Gevers wrote:
> > Which package are you working on ? (I need to retrieve your package to
> > reproduce the issue).
> 
> batmon.app¹, with proposed dsc included from here:
> http://sid.ethz.ch/debian/batmon.app/batmon.app_0.9-1.dsc

The attached path should do the trick (tested on batmon.app)

All the best

-- 
 https://github.com/dod38fr/   -o- http://search.cpan.org/~ddumont/
http://ddumont.wordpress.com/  -o-   irc: dod at irc.debian.org
commit 10f0fc5f9beec9606790e986df472f13f7ec23f4
Author: Dominique Dumont <d...@debian.org>
Date:   Wed May 17 16:26:29 2017 +0200

    copyright update: normalise existing copyright data (Closes: #862368)
    
    so the existing copyright data can be merged with data coming from
    license_check (where the copyright is already normalised)

diff --git a/lib/Config/Model/Dpkg/Copyright.pm b/lib/Config/Model/Dpkg/Copyright.pm
index a8ca8fd4..5646f1ee 100644
--- a/lib/Config/Model/Dpkg/Copyright.pm
+++ b/lib/Config/Model/Dpkg/Copyright.pm
@@ -14,7 +14,7 @@ use Path::Tiny;
 use Data::Dumper;
 
 use Config::Model::DumpAsData;
-use Dpkg::Copyright::Scanner qw/scan_files __squash __pack_files __create_tree_leaf_from_paths/;
+use Dpkg::Copyright::Scanner qw/scan_files __squash __pack_files __pack_copyright __create_tree_leaf_from_paths/;
 use Software::LicenseUtils;
 use Scalar::Util qw/weaken/;
 use Storable qw/dclone/;
@@ -69,6 +69,9 @@ sub update ($self, %args) {
         my $node = $files_obj->fetch_with_id($paths_str) ;
         my $data = $dumper->dump_as_data( node => $node );
 
+        # normalise existing copyright data (mandatory parameter, no need to test)
+        $data->{Copyright} = __pack_copyright($data->{Copyright});
+
         if ($paths_str =~ m!^debian/!) {
             $debian_paths{$paths_str} = $data;
         }