[libconfig-model-dpkg-perl] 20/36: FileLicense model: don't try to mv global license when local text is available

[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 6002c7ad3c46ef07b9859fbb2cbabe7151ab08e4
Author: Dominique Dumont <dod at debian.org>
Date:   Wed Oct 14 21:14:54 2015 +0200

    FileLicense model: don't try to mv global license when local text is available
---
 lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl b/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
index 71e90d4..70b08b4 100644
--- a/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
@@ -99,14 +99,16 @@ license: abbrev exception(?)
 my $old = $_;
 s/BSD-?(\\d)/BSD-$1-clause/;
 my $lic = $self->grab(\'- - - License\');
-$lic->move($old,$_) unless $lic->defined($_);
+my $text = $self->grab_value(\'- full_license\');
+$lic->move($old,$_) unless $text or $lic->defined($_);
 ',
             'msg' => 'Please use BSD-x-clause name, like BSD-3-clause'
           },
           '\\bMIT\\b' => {
             'fix' => '# need to test if target exists before moving element
 my $lic = $self->grab(\'- - - License\');
-$lic->move($_,\'Expat\') unless $lic->defined(\'Expat\');
+my $text = $self->grab_value(\'- full_license\');
+$lic->move($_,\'Expat\') unless $text or $lic->defined(\'Expat\') ;
 $_ = \'Expat\';
 ',
             'msg' => 'There are many versions of the MIT license. Please use Expat instead, when it matches. See L<Debian copyright format|https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#license-specification> for details.'

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