[libconfig-model-dpkg-perl] 05/33: Scanner: fix clean up of alternate licenses

[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 216ce14370361d32326ef4cb8287451f80a65675
Author: Dominique Dumont <dod at debian.org>
Date:   Tue Mar 24 20:51:18 2015 +0100

    Scanner: fix clean up of alternate licenses
---
 lib/Dpkg/Copyright/Scanner.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index f8975af..97e275f 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -83,6 +83,7 @@ sub scan_files ( %args ) {
         # say "found: $line";
         my ($f,$l,$c) = split /\t/, $line; 
         $f =~ s!\./!!;
+
         $l =~ s/([*?\\])/\\$1/g;
         $l =~ s/\s*\(unversioned\/unknown version\)//;
         $l =~ s/\s*\(with incorrect FSF address\)//;
@@ -97,7 +98,7 @@ sub scan_files ( %args ) {
         $l =~ s/^\s*public domain$/public-domain/i;
 
         # this is very fragile. may need to change license-check to output license keyword
-        $l =~ s/ / and /g;
+        $l =~ s/ / and /g unless $l =~ /\bor\b/;
 
         $c =~ s/'//g;
         $c =~ s/^©\s*//;

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