[libconfig-model-dpkg-perl] 26/36: Copyright parser: improved Files 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 d5a6b5a93a3c425d2b4dd4933db9b4059abdb7b8
Author: Dominique Dumont <dod at debian.org>
Date:   Thu Oct 15 21:07:56 2015 +0200

    Copyright parser: improved Files cleanup
---
 lib/Config/Model/Backend/Dpkg/Copyright.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Config/Model/Backend/Dpkg/Copyright.pm b/lib/Config/Model/Backend/Dpkg/Copyright.pm
index 9e2cbbd..0654a95 100644
--- a/lib/Config/Model/Backend/Dpkg/Copyright.pm
+++ b/lib/Config/Model/Backend/Dpkg/Copyright.pm
@@ -107,9 +107,12 @@ sub read {
             }
             if ($v =~ /,/) {
                 $logger->warn("Found comma in Files line, cleaning up");
-                $v =~ s/ *,+[ \t]*/ /g;
-                $v =~ s/^\s*|\s*$//g;
+                $v =~ s/,+/ /g;
             }
+            $v =~ s/(?<=\w)[ \t]+/ /g;
+            $v =~ s/[ \t]+\n/\n/g;
+            $v =~ s/^\s*|\s*$//g;
+            $logger->debug("Files paragraph after cleanup $l: '$v'");
             $file_paragraph{$v} = $section_ref ;
             push @file_names, $v ;
         }

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