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 547c1742fc2539e16861f52a42eff2ce4d5bd8e0
Author: Dominique Dumont <d...@debian.org>
Date: Tue Jan 24 18:32:50 2017 +0100
fix cme update dpkg (req config-model >= 2.098)
cme update can be called on dpkg or dpkg-control. This changes the
meaning of the '!' in fix.scanned.copyright file when called with 'cme
update dpkg'. For instance, with '! Format', Config::model::Loader
searches Format element in Dpkg config instead of Dpkg::Copyright
config.
This commit fixes this issue using parameter caller_is_root which was
added to Config::Model 2.098.
---
debian/control | 2 +-
lib/Config/Model/Dpkg/Copyright.pm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 453aa2c..6ffe54c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
Build-Depends-Indep: bash-completion,
libapt-pkg-perl,
libarray-intspan-perl,
- libconfig-model-perl (>= 2.092),
+ libconfig-model-perl (>= 2.098),
libconfig-model-tester-perl (>= 2.057),
libexporter-lite-perl,
liblog-log4perl-perl,
diff --git a/lib/Config/Model/Dpkg/Copyright.pm
b/lib/Config/Model/Dpkg/Copyright.pm
index 2aae235..a8ca8fd 100644
--- a/lib/Config/Model/Dpkg/Copyright.pm
+++ b/lib/Config/Model/Dpkg/Copyright.pm
@@ -311,7 +311,7 @@ sub _apply_fix_scan_copyright_file ($self, $current_dir) {
$self->_say( "Note: loading @fixes fixes from copyright fix files") if
@fixes;
foreach my $fix ( @fixes) {
my @l = grep { /[^\s]/ } grep { ! m!^(#|//)! } $fix->lines_utf8;
- eval { $self->load( join(' ',@l) ); };
+ eval { $self->load( steps => join(' ',@l) , caller_is_root => 1 );
};
my $e = $@;
if ($e) {
my $msg = $e->full_message;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
