[libconfig-model-dpkg-perl] 09/33: C::M::D::Copyroght: fix update from scratch...
dod at debian.org
dod at debian.org
Mon Mar 30 17:41:37 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 636d6d8814ab5e9e402c4378fe6a71300d051a53
Author: Dominique Dumont <dod at debian.org>
Date: Thu Mar 26 13:50:37 2015 +0100
C::M::D::Copyroght: fix update from scratch...
short_name must be set after global license is created (even a dummy one)
---
lib/Config/Model/Dpkg/Copyright.pm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/Config/Model/Dpkg/Copyright.pm b/lib/Config/Model/Dpkg/Copyright.pm
index 07d52a2..e2df732 100644
--- a/lib/Config/Model/Dpkg/Copyright.pm
+++ b/lib/Config/Model/Dpkg/Copyright.pm
@@ -101,15 +101,19 @@ sub update ($self, %args) {
# skip if full_license is already provided in Files section
next if $current_name eq $l and $lic_obj->grab_value('full_license');
- $lic_obj->load( qq!short_name="$l"!);
# skip if all licenses are provided in global license section
my $ok = 0;
my $global_lic = $lic_obj->grab('- - License');
my $size = map { $ok++ if $global_lic->defined($_) ; } split /\s+or\s+/,$l;
- next if $ok eq $size;
- $lic_obj->load( qq!full_license="$text"!);
+ if ($ok ne $size) {
+ say "Adding dummy license text for license $l for path @$paths";
+ $lic_obj->load( qq!full_license="$text"!);
+ }
+
+ $lic_obj->load( qq!short_name="$l"!);
+
}
}
--
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