[libconfig-model-dpkg-perl] 16/24: removed $check_perl_lib 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 adf282e85f6b1b2ac6c2da5d3156c1e9408f148c
Author: Dominique Dumont <dod at debian.org>
Date: Thu Apr 17 21:17:28 2014 +0200
removed $check_perl_lib from check_perl_lib_dep
---
lib/Config/Model/Dpkg/Dependency.pm | 38 +++++++++++++------------------------
1 file changed, 13 insertions(+), 25 deletions(-)
diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm
index 5bf2ce5..66073cd 100644
--- a/lib/Config/Model/Dpkg/Dependency.pm
+++ b/lib/Config/Model/Dpkg/Dependency.pm
@@ -468,34 +468,11 @@ sub check_perl_lib_dep {
my @ideal_lib_dep ;
my @ideal_dep_chain = (\@ideal_perl_dep);
- my ($check_perl_lib, $get_perl_versions, $on_get_perl_versions) ;
+ my ($get_perl_versions, $on_get_perl_versions) ;
my ($v_normal) ;
- $check_perl_lib = sub {
- my $has_older_perl = shift;
- $async_log->debug( "check_perl_lib called with dep_v " . ( $dep_v // 'undef' ) );
-
- my $on_perl_lib_check_done = sub {
- my $has_older_lib = shift;
- $async_log->debug("on_perl_lib_check_done called");
- if ($has_older_perl) {
- push @ideal_lib_dep, $dep_name;
- push @ideal_lib_dep, '>=', $dep_v if $has_older_lib;
- }
- $get_perl_versions->();
- };
-
- if ( defined $dep_v ) {
- my @res = $self->check_versioned_dep( $depend );
- $on_perl_lib_check_done->(@res);
- }
- else {
- $on_perl_lib_check_done->(0);
- }
- };
-
$get_perl_versions = sub {
my @res = $self->get_available_version( 'perl');
$on_get_perl_versions->(@res) ;
@@ -577,8 +554,19 @@ sub check_perl_lib_dep {
@res = $self->check_versioned_dep( ['perl', '>=', $v_normal] );
my $has_older_perl = $res[0] ;
push @ideal_perl_dep, '>=', $v_normal if $has_older_perl;
- $check_perl_lib->($has_older_perl) ;
+ if ( defined $dep_v ) {
+ my ($has_older_lib) = $self->check_versioned_dep( $depend );
+ if ($has_older_perl) {
+ push @ideal_lib_dep, $dep_name;
+ push @ideal_lib_dep, '>=', $dep_v if $has_older_lib;
+ }
+ }
+ elsif ($has_older_perl) {
+ push @ideal_lib_dep, $dep_name;
+ }
+
+ $get_perl_versions->();
return $ret ;
}
--
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