[libconfig-model-dpkg-perl] 12/24: check_or_fix_pkg_name is now synchronous

[dod at debian.org]

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 e86a52813a1ddb8c2fc6f49637bab3babded3cf8
Author: Dominique Dumont <dod at debian.org>
Date:   Tue Apr 15 21:16:46 2014 +0200

    check_or_fix_pkg_name is now synchronous
---
 lib/Config/Model/Dpkg/Dependency.pm | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm
index aa5b880..8c8e761 100644
--- a/lib/Config/Model/Dpkg/Dependency.pm
+++ b/lib/Config/Model/Dpkg/Dependency.pm
@@ -292,11 +292,9 @@ sub check_dependency {
 
     foreach my $dep (@dep_chain) {
         next unless ref($dep) ; # no need to check variables
-        my $cb = sub {
-            $self->check_or_fix_essential_package($apply_fix, $dep, $old) ; # sync
-            $self->check_or_fix_dep($apply_fix, $dep, $old) ;
-        };
-        $self->check_or_fix_pkg_name($apply_fix, $dep, $old, $cb) ; # async
+        $self->check_or_fix_pkg_name($apply_fix, $dep, $old) ;
+		$self->check_or_fix_essential_package($apply_fix, $dep, $old) ;
+		$self->check_or_fix_dep($apply_fix, $dep, $old) ;
     }
 
 
@@ -682,7 +680,7 @@ my %pkg_replace = (
 ) ;
 
 sub check_or_fix_pkg_name {
-    my ( $self, $apply_fix, $dep_info, $old, $next ) = @_;
+    my ( $self, $apply_fix, $dep_info, $old ) = @_;
     my ( $pkg,  $oper,      $vers )    = @$dep_info;
 
     $logger->debug("called with '", scalar $self->struct_to_dep($dep_info), "' and fix $apply_fix")
@@ -705,26 +703,16 @@ sub check_or_fix_pkg_name {
     # check if this package is defined in current control file
     if ($self->grab(step => "- - binary:$pkg", qw/mode loose autoadd 0/)) {
         $logger->debug("dependency $pkg provided in control file") ;
-        $next->() ;
     }
     else {
-        my $cb = sub {
-            if ( @_ == 0 and not $virtual_hash{$pkg}) {
-                # no version found for $pkg
-                # don't know how to distinguish virtual package from source package
-                $logger->debug("unknown package $pkg");
-                $self->add_warning(
-                    "package $pkg is unknown. Check for typos if not a virtual package.");
-            }
-            $async_log->debug("callback for check_or_fix_pkg_name -> end for $pkg");
-            $next->( );
-        };
-
-        # is asynchronous
-        $async_log->debug("begin on $pkg");
         my @res = $self->get_available_version(  $pkg );
-		$cb->(@res);
-        # if no pkg was found
+		if ( @res == 0 and not $virtual_hash{$pkg}) {
+			# no version found for $pkg
+			# don't know how to distinguish virtual package from source package
+			$logger->debug("unknown package $pkg");
+			$self->add_warning(
+				"package $pkg is unknown. Check for typos if not a virtual package.");
+		}
     }
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git