[libconfig-model-dpkg-perl] 01/10: do not issue a warning while applying fix

[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 8e6fe1968b0a4d88d20062af4a84e8e166b3d12c
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Sep 2 19:05:23 2016 +0200

    do not issue a warning while applying fix
    
    There a circular chain of error/warnings between available global
    license and licenses used by files entries:
    - a file entry must either proivde license text or
      use a license declared in License:
    - a license declared in License: should be used at least once by
      a file entry
    
    This patch breaks the circular chain by skipping warning while renaming
    a license
---
 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 920e987..3dec2a6 100644
--- a/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
@@ -101,7 +101,8 @@ s/BSD-?(\\d)/BSD-$1-clause/;
 my $lic = $self->grab(\'- - - License\');
 # no check to avoid unused license warning (which is not yet moved)
 my $text = $self->grab_value(steps => \'- full_license\', check => \'no\');
-$lic->move($old,$_) unless $text or $lic->defined($_);
+# likewise because check occurs before actual move
+$lic->move($old,$_, check => \'no\') unless $text or $lic->defined($_);
 ',
             'msg' => 'Please use BSD-x-clause name, like BSD-3-clause'
           },
@@ -110,7 +111,8 @@ $lic->move($old,$_) unless $text or $lic->defined($_);
 my $lic = $self->grab(\'- - - License\');
 # no check to avoid unused license warning (which is not yet moved)
 my $text = $self->grab_value(steps => \'- full_license\', check => \'no\');
-$lic->move($_,\'Expat\') unless $text or $lic->defined(\'Expat\') ;
+# likewise because check occurs before actual move
+$lic->move($_,\'Expat\', check => \'no\') 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> and L<wikipedia|https://en.wikipedia.org/wiki/MIT_License#Various_versions>for details.'

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