From 92ae52fb838965a3696cf10daf4ea24cfa7efcb8 Mon Sep 17 00:00:00 2001
From: Andreas Barth <aba@not.so.argh.org>
Date: Sun, 6 Jun 2010 20:08:23 +0000
Subject: [PATCH] wanna-build: improve logging

---
 bin/wanna-build | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/wanna-build b/bin/wanna-build
index f8d5721..ffb3348 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -518,7 +518,7 @@ sub process {
                                 $$srcs->{$k} = $pkg;
                             }
                         }
-                        parse_all_v3($$srcs);
+                        parse_all_v3($$srcs, {'arch' => $arch, 'suite' => $distribution, 'time' => $curr_date});
                         @bpkgs = @ipkgs unless @bpkgs;
                         call_edos_depcheck( {'arch' => $arch, 'pkgs' => @bpkgs, 'srcs' => $$srcs, 'depwait' => 1 });
                         last SWITCH;
@@ -2922,6 +2922,7 @@ sub parse_argv() {
 
 sub parse_all_v3() {
     my $srcs = shift;
+    my $vars = shift;
     my $db = get_all_source_info();
     my $binary = $srcs->{'_binary'};
 
@@ -2935,7 +2936,7 @@ sub parse_all_v3() {
 
         unless ($pkg) {
             next SRCS if $pkgs->{'status'} eq 'not-for-us';
-            my $logstr = "merge-v3 ".$name." ($arch):";
+            my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'} ($vars->{'arch'}, $vars->{'suite'}):";
 
             # does at least one binary exist in the database and is more recent - if so, we're probably just outdated, ignore the source package
             for my $bin (@{$pkgs->{'binary'}}) {
@@ -2946,7 +2947,7 @@ sub parse_all_v3() {
             }
             $pkg->{'package'}  = $name;
         }
-        my $logstr = "merge-v3 ".$name."_$pkgs->{'version'} ($arch, previous-state: $pkg->{'state'}):";
+        my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'} ($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}, $pkg->{'state'}):";
 
         if (isin($pkgs->{'status'}, qw (installed related)) && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < $pkg->{'binary_nmu_version'}) {
                 $pkgs->{'status'} = 'out-of-date';
@@ -3029,7 +3030,7 @@ sub parse_all_v3() {
     foreach my $name (keys %$db) {
         next if $srcs->{$name};
         my $pkg = $db->{$name};
-        my $logstr = "merge-v3 ".$name."_$pkg->{'version'} ($arch, previous-state: $pkg->{'state'}):";
+        my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkg->{'version'} ($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'state'}):";
         # package disappeared - delete
         change_state( \$pkg, 'deleted' );
         log_ta( $pkg, "--merge-v3: deleted" ) unless $simulate;
-- 
2.39.2