[libconfig-model-dpkg-perl] 19/24: removed $on_get_perl_versions from check_perl_lib_dep
dod at debian.org
dod at debian.org
Sun Apr 20 13:07:47 UTC 2014
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 83223fa4086de405b4249872bbe0227c066b6565
Author: Dominique Dumont <dod at debian.org>
Date: Fri Apr 18 19:54:15 2014 +0200
removed $on_get_perl_versions from check_perl_lib_dep
---
lib/Config/Model/Dpkg/Dependency.pm | 75 +++++++++++++++----------------------
1 file changed, 31 insertions(+), 44 deletions(-)
diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm
index d79a622..c925b46 100644
--- a/lib/Config/Model/Dpkg/Dependency.pm
+++ b/lib/Config/Model/Dpkg/Dependency.pm
@@ -448,7 +448,6 @@ sub check_perl_lib_dep {
$logger->debug("called with $actual_dep with apply_fix $apply_fix");
my ( $dep_name, $oper, $dep_v ) = @$depend;
- my $ret = 1;
$pname =~ s/-/::/g;
@@ -460,50 +459,14 @@ sub check_perl_lib_dep {
# check for dual life module, module name follows debian convention...
my @dep_name_as_perl = Module::CoreList->find_modules(qr/^$pname$/i) ;
- return $ret unless @dep_name_as_perl;
+ return 1 unless @dep_name_as_perl;
- return $ret if defined $dep_v && $dep_v =~ m/^\$/ ;
+ return 1 if (defined $dep_v && $dep_v =~ m/^\$/) ;
my @ideal_perl_dep = qw/perl/ ;
my @ideal_lib_dep ;
my @ideal_dep_chain = (\@ideal_perl_dep);
- my ($on_get_perl_versions) ;
-
- my ($v_normal) ;
-
-
- $on_get_perl_versions = sub {
- my %perl_version = @_ ;
- $async_log->debug("running on_get_perl_versions for $actual_dep") ;
- my $has_older_perl_in_sid = ( $vs->compare( $v_normal, $perl_version{sid} ) < 0 ) ? 1 : 0;
- $logger->debug(
- "perl $v_normal is",
- $has_older_perl_in_sid ? ' ' : ' not ',
- "older than perl in sid ($perl_version{sid})"
- );
-
- my @ordered_ideal_dep = $has_older_perl_in_sid ?
- ( \@ideal_perl_dep, \@ideal_lib_dep ) :
- ( \@ideal_lib_dep, \@ideal_perl_dep ) ;
- my $ideal_dep = $self->struct_to_dep( @ordered_ideal_dep );
-
- if ( $actual_dep ne $ideal_dep ) {
- if ($apply_fix) {
- @$input = @ordered_ideal_dep ; # notify_change called in check_value
- $logger->info("fixed dependency with: $ideal_dep, was @$depend");
- }
- else {
- $self->{nb_of_fixes}++;
- my $msg = "Dependency of dual life package should be '$ideal_dep' not '$actual_dep'";
- $self->add_warning ($msg);
- $logger->info("will warn: $msg (fix++)");
- }
- $ret = 0;
- }
- } ;
-
- # start the whole async stuff
my @res = $self->get_available_version( $dep_name);
# check version for the first available version in Debian: debian
@@ -537,9 +500,9 @@ sub check_perl_lib_dep {
version->parse( $cpan_dep_v )
);
- return $ret unless defined $v_decimal;
+ return 1 unless defined $v_decimal;
- $v_normal = version->new($v_decimal)->normal;
+ my $v_normal = version->new($v_decimal)->normal;
$v_normal =~ s/^v//; # loose the v prefix
if ( $logger->is_debug ) {
my $dep_str = $dep_name . ( defined $check_v ? ' ' . $check_v : '' );
@@ -560,10 +523,34 @@ sub check_perl_lib_dep {
push @ideal_lib_dep, $dep_name;
}
- @res = $self->get_available_version( 'perl');
- $on_get_perl_versions->(@res) ;
+ my %perl_version = $self->get_available_version( 'perl');
+ my $has_older_perl_in_sid = ( $vs->compare( $v_normal, $perl_version{sid} ) < 0 ) ? 1 : 0;
+ $logger->debug(
+ "perl $v_normal is",
+ $has_older_perl_in_sid ? ' ' : ' not ',
+ "older than perl in sid ($perl_version{sid})"
+ );
+
+ my @ordered_ideal_dep = $has_older_perl_in_sid ?
+ ( \@ideal_perl_dep, \@ideal_lib_dep ) :
+ ( \@ideal_lib_dep, \@ideal_perl_dep ) ;
+ my $ideal_dep = $self->struct_to_dep( @ordered_ideal_dep );
- return $ret ;
+ if ( $actual_dep ne $ideal_dep ) {
+ if ($apply_fix) {
+ @$input = @ordered_ideal_dep ; # notify_change called in check_value
+ $logger->info("fixed dependency with: $ideal_dep, was @$depend");
+ }
+ else {
+ $self->{nb_of_fixes}++;
+ my $msg = "Dependency of dual life package should be '$ideal_dep' not '$actual_dep'";
+ $self->add_warning ($msg);
+ $logger->info("will warn: $msg (fix++)");
+ }
+ return 0;
+ }
+
+ return 1 ;
}
sub check_versioned_dep {
--
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