[libconfig-model-dpkg-perl] 10/11: (c) scanner: extracted __split_copyright function
dod at debian.org
dod at debian.org
Fri Mar 20 16:25:54 UTC 2015
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 3b91d1bb58d5e730d85821dd9e600098a22b24f5
Author: Dominique Dumont <dod at debian.org>
Date: Fri Mar 20 12:53:34 2015 +0100
(c) scanner: extracted __split_copyright function
---
lib/Dpkg/Copyright/Scanner.pm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index acadfae..ffd59f1 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -146,16 +146,22 @@ sub scan_files ( %args ) {
return @copyright_data;
}
+sub __split_copyright ($c) {
+ my @data = split /(?<=\d)[,\s]+/, $c;
+ my $owner = pop @data;
+ return undef unless defined $owner;
+ $owner =~ s/^\s+|\s+$//g;
+ return ($owner, at data);
+}
+
sub __pack_copyright ($r) {
return $r if $r eq 'no-info-found';
my %cop;
$r =~ /^[\s\W]+|[\s\W]+$/g;
foreach my $c ( split( m!\s*/\s*!, $r)) {
- my @data = split /(?<=\d)[,\s]+/, $c;
- my $owner = pop @data;
+ my ($owner, @data) = __split_copyright($c);
return $r unless defined $owner;
- $owner =~ s/^\s+|\s+$//g;
$cop{$owner} ||= [] ;
push $cop{$owner}->@*, @data ;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git
More information about the Pkg-perl-cvs-commits
mailing list