[SCM] Debian native package for Config::Model::Dpkg branch, master, updated. debian/2.036-17-gdc3acc3

[Dominique Dumont]

The following commit has been merged in the master branch:
commit 35067d74aaf8b2d0fc3eed1086eef764dd2b149b
Author: Dominique Dumont <dod at debian.org>
Date:   Fri May 17 13:44:19 2013 +0200

    Improved traces

diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm
index b56172e..ab918fa 100644
--- a/lib/Config/Model/Dpkg/Dependency.pm
+++ b/lib/Config/Model/Dpkg/Dependency.pm
@@ -142,9 +142,11 @@ sub check_dependency {
     # or it can be in one of the call backs
     my $on_check_all_done = sub {
         if ($logger->is_debug) {
-            $async_log->debug("in check_dependency callback for ",$self->composite_name)
-                if $async_log->is_debug;
             my $new = $value // '<undef>' ;
+            $async_log->debug("in check_dependency callback for ",$self->composite_name,
+                " ($new) fix is $apply_fix")
+                if $async_log->is_debug;
+            no warnings 'uninitialized';
             $logger->debug("'$old' done".($apply_fix ? " changed to '$new'" : ''));
         }
 
@@ -158,11 +160,11 @@ sub check_dependency {
         $callback->(%args) if $callback ;
     } ;
     
-    $async_log->debug("begin for ",$self->composite_name) if $async_log->is_debug;
+    $async_log->debug("begin for ",$self->composite_name, " fix is $apply_fix") if $async_log->is_debug;
     $pending_check->begin($on_check_all_done) ;
     
     if (defined $value) {
-        $logger->debug("'$value', calling check_depend with Parse::RecDescent");
+        $logger->debug("calling check_depend with Parse::RecDescent with '$value'");
         dep_parser->check_depend ( $value,1,$self,$pending_check,$apply_fix, \@fixed_dep) 
             // $self->add_error("dependency '$value' does not match grammar") ;
 
@@ -433,7 +435,7 @@ sub check_perl_lib_dep {
 sub check_versioned_dep {
     my ($self, $callback ,$dep_info) = @_ ;
     my ( $pkg,  $oper,      $vers )    = @$dep_info;
-    $async_log->debug("called with @$dep_info");
+    $logger->debug("called with '", $self->struct_to_dep($dep_info),"'") if $logger->is_debug;
 
     # special case to keep lintian happy
     $callback->(1) if $pkg eq 'debhelper' ;
@@ -499,7 +501,7 @@ sub has_older_version_than {
 sub check_or_fix_essential_package {
     my ( $self, $apply_fix, $dep_info ) = @_;
     my ( $pkg,  $oper,      $vers )    = @$dep_info;
-    $logger->debug("called with @$dep_info");
+    $logger->debug("called with '", scalar $self->struct_to_dep($dep_info), "' and fix $apply_fix") if $logger->is_debug;
 
     # Remove unversioned dependency on essential package (Debian bug 684208)
     # see /usr/share/doc/libapt-pkg-perl/examples/apt-cache
@@ -531,7 +533,7 @@ my %pkg_replace = (
 sub check_or_fix_pkg_name {
     my ( $self, $pending_check_cv, $apply_fix, $dep_info ) = @_;
     my ( $pkg,  $oper,      $vers )    = @$dep_info;
-    $logger->debug("called with @$dep_info");
+    $logger->debug("called with '", scalar $self->struct_to_dep($dep_info), "' and fix $apply_fix") if $logger->is_debug;
 
     my $new = $pkg_replace{$pkg} ;
     if ( $new ) {
@@ -559,12 +561,12 @@ sub check_or_fix_pkg_name {
             $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") ;
+        $async_log->debug("callback for check_or_fix_pkg_name -> end for $pkg") ;
         $pending_check_cv->end ;
     } ;
    
     # is asynchronous
-    $async_log->debug("begin") ;
+    $async_log->debug("begin on $pkg") ;
     $pending_check_cv->begin ;
     $self->get_available_version($cb,$pkg ) ;
     # if no pkg was found
@@ -573,8 +575,9 @@ sub check_or_fix_pkg_name {
 # all subs but one there are synchronous
 sub check_or_fix_dep {
     my ( $self, $pending_check_cv, $apply_fix, $dep_info ) = @_;
-    my ( $pkg,  $oper,      $vers )    = @$dep_info;
-    $logger->debug("called with @$dep_info");
+    my ( $pkg,  $oper,      $vers, @archs )    = @$dep_info;
+
+    $logger->debug("called with '", scalar $self->struct_to_dep($dep_info), "' and fix $apply_fix") if $logger->is_debug;
 
     if ( $pkg eq 'debhelper' ) {
         $self->check_debhelper( $apply_fix, $dep_info );

-- 
Debian native package for Config::Model::Dpkg