[libconfig-model-dpkg-perl] 03/11: Scanner: renamed variable
dod at debian.org
dod at debian.org
Fri Jul 3 19:20:12 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 0abc48fa2c3df92fe83d87567781911afaf56ce9
Author: Dominique Dumont <dod at debian.org>
Date: Sun Jun 28 21:28:14 2015 +0200
Scanner: renamed variable
Gbp-Dch: Ignore
---
lib/Dpkg/Copyright/Scanner.pm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index 36ec096..7d4ebee 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -366,12 +366,12 @@ sub __squash ($h) {
# find the most used (c) info in this directory (or the existing '*' entry)
my $max = 0;
- my $max_id = $h->{'*'};
- if (not defined $max_id) {
+ my $main_license_id = $h->{'*'};
+ if (not defined $main_license_id) {
foreach my $id (sort keys %count) {
if ($count{$id} > $max) {
$max = $count{$id};
- $max_id = $id ;
+ $main_license_id = $id ;
}
}
}
@@ -380,18 +380,18 @@ sub __squash ($h) {
# be represented by '*' entry
foreach my $name (sort keys %$h) {
my $item = $h->{$name};
- if (ref($item) and defined $item->{'*'} and $item->{'*'} == $max_id) {
+ if (ref($item) and defined $item->{'*'} and $item->{'*'} == $main_license_id) {
# rename item/* to item/. when covered by ./*
# this is a "weak" directory info which is handled specially
$item->{'.'} = delete $item->{'*'};
}
if (not ref ($item)) {
# delete file that is represented by '*' entry
- delete $h->{$name} if $item == $max_id;
+ delete $h->{$name} if $item == $main_license_id;
}
}
# here's the '*' file representing the most used (c) info
- $h->{'*'} //= $max_id if defined $max_id;
+ $h->{'*'} //= $main_license_id if defined $main_license_id;
return $h;
}
--
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