[libconfig-model-dpkg-perl] 08/36: CMD::Copyright: keep entries with unknown license

[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 01c67c8bd019731337e76db31e3e014b13ab29dc
Author: Dominique Dumont <dod at debian.org>
Date:   Wed Sep 30 11:20:45 2015 +0200

    CMD::Copyright: keep entries with unknown license
---
 lib/Config/Model/Dpkg/Copyright.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/Config/Model/Dpkg/Copyright.pm b/lib/Config/Model/Dpkg/Copyright.pm
index aea3759..0bc1648 100644
--- a/lib/Config/Model/Dpkg/Copyright.pm
+++ b/lib/Config/Model/Dpkg/Copyright.pm
@@ -72,7 +72,7 @@ sub update ($self, %args) {
         # say "load '$path' with '$c' ('$l') old '$old_cop' ('$old_lic')";
         # clobber old data
         $new_data->{Copyright} = $c if ($c !~ /no-info-found|UNKNOWN/ or not $old_cop);
-        $new_data->{License}{short_name} = $l if ($l ne 'UNKNOWN');
+        $new_data->{License}{short_name} = $l if ($l ne 'UNKNOWN' or not $old_lic);
 
         # create an inventory of different file copyright and license data
         my $dumper = Data::Dumper->new([$new_data])->Sortkeys(1)->Indent(0);
@@ -146,8 +146,6 @@ sub update ($self, %args) {
         my $path_str = $self->normalize_path(\@paths);
         my $l = $datum->{License}{short_name};
 
-        next unless $l ;
-
         my $norm_path_str = $self->normalize_path(\@paths);
 
         # if full_license is not provided in datum, check global license(s)

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