[libconfig-model-dpkg-perl] 06/11: fix warnings by removing last traces of async calls

[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 86f8bb38aa5cfe86f2d9b53f0f3dd1e1243abdd8
Author: Dominique Dumont <dod at debian.org>
Date:   Mon May 5 19:23:05 2014 +0200

    fix warnings by removing last traces of async calls
---
 lib/Config/Model/Dpkg/Dependency.pm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm
index a5f36b9..ca3bc27 100644
--- a/lib/Config/Model/Dpkg/Dependency.pm
+++ b/lib/Config/Model/Dpkg/Dependency.pm
@@ -246,23 +246,19 @@ sub dep_parser {
 sub check_value {
     my $self = shift ;
     my %args = @_ > 1 ? @_ : (value => $_[0]) ;
-    my $cb = delete $args{callback} || sub {} ;
-    my $my_cb = sub {
-        $self->check_dependency(@_, callback => $cb) ;
-    } ;
 
     $args{fix} //= 0;
 	# when fixing, SUPER::check_value may modify $args{value} before calling back
-    $self->SUPER::check_value(%args, callback => $my_cb) ;
-
+    my ($ok, $value) = $self->SUPER::check_value(%args) ;
+    return $self->check_dependency(%args, value => $value, ok => $ok) ;
 }
 
 sub check_dependency {
     my $self = shift;
     my %args = @_ ;
 
-    my ($value, $check, $silent, $notify_change, $ok, $callback,$apply_fix)
-        = @args{qw/value check silent notify_change ok callback fix/} ;
+    my ($value, $check, $silent, $notify_change, $ok, $apply_fix)
+        = @args{qw/value check silent notify_change ok fix/} ;
 
     # value is one dependency, something like "perl ( >= 1.508 )"
     # or exim | mail-transport-agent or gnumach-dev [hurd-i386]
@@ -310,7 +306,7 @@ sub check_dependency {
         no warnings 'uninitialized';
         $self->_store_fix( $old, $new ) if $apply_fix and $new ne $old;
     }
-	$callback->(%args) if $callback;
+    return ($ok, $new) ;
 }
 
 sub check_debhelper_version {

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