[libconfig-model-dpkg-perl] 02/04: fix license split in short names (Closes: #863052)

[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 4ef6ff892fd8da6fcd078b24aff8a170d4816ff0
Author: Dominique Dumont <dod at debian.org>
Date:   Mon May 22 21:09:03 2017 +0200

    fix license split in short names (Closes: #863052)
    
    This one was broken: it forgot 'and' and commas.
---
 lib/Config/Model/Dpkg/Copyright.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Config/Model/Dpkg/Copyright.pm b/lib/Config/Model/Dpkg/Copyright.pm
index 5646f1e..58ceff7 100644
--- a/lib/Config/Model/Dpkg/Copyright.pm
+++ b/lib/Config/Model/Dpkg/Copyright.pm
@@ -230,7 +230,7 @@ sub update ($self, %args) {
         # if full_license is not provided in datum, check global license(s)
         if (not $datum->{License}{full_license}) {
             my $ok = 0;
-            my @sub_licenses = split /\s+or\s+/,$l;
+            my @sub_licenses = split /[,\s]+(?:or|and)[,\s]+/,$l;
             my $lic_count = 0;
             my @empty_licenses = grep {
                 my $text = $self->grab_value(steps => qq!License:"$_" text!, check =>'no') ;

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