[libconfig-model-dpkg-perl] 01/33: opyright model: suppress warnings found during Software::License text cleanup

[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 4f16a7331ab7752d0267eed6680ef0c4cb4f709c
Author: Dominique Dumont <dod at debian.org>
Date:   Mon Mar 23 13:31:24 2015 +0100

    opyright model: suppress warnings found during Software::License text cleanup
---
 lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl b/lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl
index 556a944..4985610 100644
--- a/lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl
@@ -21,9 +21,9 @@
       {
         'compute' => {
           'allow_override' => '1',
-          'formula' => q|require Software::LicenseUtils ;
+          'formula' => 'require Software::LicenseUtils ;
 my $lic = &index( - ) ;
-my $h = { short_name => $lic, holder => 'foo' } ;
+my $h = { short_name => $lic, holder => \'foo\' } ;
 my $text;
 
 if (defined $lic and $lic) {
@@ -31,10 +31,13 @@ if (defined $lic and $lic) {
    eval {
        $text = Software::LicenseUtils->new_from_short_name($h)->debian_text ;
    } ;
-   # need to cleanup text to mimic cleanup done when copyright data is read from file
-   chomp($text);
-   # work-around a bug in lgpl license text summary... my bad :-/
-   $text =~ s!^\\.!!mg;
+   if ($text) {
+       # need to cleanup text to mimic cleanup done when copyright
+       # data is read from file
+       chomp($text);
+       # work-around a bug in lgpl license text summary... my bad :-/
+       $text =~ s!^\\.!!mg;
+   }
 # FIXME: find a way to warn user if a license is unknown only when
 # text is not set by another mean... may loop bad if not careful
 #   if ($@ and ! $self->value_object->{data}) {
@@ -42,7 +45,7 @@ if (defined $lic and $lic) {
 #   }
 }
 
-$text;|,
+$text;',
           'undef_is' => '\'\'',
           'use_eval' => '1'
         },

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