[libconfig-model-dpkg-perl] 02/03: fix pack_cpopyright to handle debfmt

[dod at debian.org]

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 eaee0e1a49a00cfa36642e818b8976c38310bbb7
Author: Dominique Dumont <dod at debian.org>
Date:   Wed Aug 23 21:03:07 2017 +0200

    fix pack_cpopyright to handle debfmt
    
    Functions was not able to pack correctly multiline Copyright data coming
    from debian/copyright. Only the first line was kept. Following lines
    were dropped...
    
    ... Oops
---
 lib/Dpkg/Copyright/Scanner.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index 3854ed4..4c2444b 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -372,7 +372,8 @@ sub __pack_copyright ($r) {
     return $r if $r eq 'no-info-found';
     my %cop;
     $r =~ /^[\s\W]+|[\s\W]+$/g;
-    foreach my $c ( split( m!\s+/\s+!, $r)) {
+    # split licensescheck output or debfmt data
+    foreach my $c ( split( m!(?:\s+/\s+)|(?:\s*\n\s*)!, $r) ) {
         my ($owner, @data) = __split_copyright($c);
         return $r unless defined $owner;
         $cop{$owner} ||= [] ;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git