From bed156f5d827991658f8c81cd9e698818ae701e6 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Mon, 10 Dec 2012 20:50:39 +0000
Subject: Factorize dump_status/dump_cache_par calls

---
 iurt | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/iurt b/iurt
index a9ed411..142fcdb 100755
--- a/iurt
+++ b/iurt
@@ -833,8 +833,6 @@ sub rebuild_one {
     unless (-f "$dir/$srpm") {
 	$cache->{failure}{$srpm} = 1;
 	$run{status}{$srpm} = 'missing';
-	dump_cache_par(\%run);
-	dump_status($local_spool, \%run);
 	return;
     } 
     # FIXME unfortunately urpmi stalls quite often
@@ -892,8 +890,6 @@ retry:
 	$srpm = $old_srpm;
 	$cache->{failure}{$srpm} = 1;
 	$run{status}{$srpm} = 'recreate_srpm_failure';
-	dump_cache_par(\%run);
-	dump_status($local_spool, \%run);
 	return;
     } 
 
@@ -992,9 +988,6 @@ retry:
 	
 	$cache->{failure}{$srpm} = 1;
 	$run{status}{$srpm} = 'build_failure';
-	# 20060615
-	dump_cache_par(\%run);
-	dump_status($local_spool, \%run);
 	return;
     }
     
@@ -1049,9 +1042,6 @@ retry:
 	}
 	process_queue($config, \%run, \@wrong_rpm, 1);
     }
-    dump_status($local_spool, \%run);
-    # dump_cache each time so that concurrent process can get updated
-    dump_cache_par(\%run) if $run{concurrent_run};
     return 1;
 }
 
@@ -1096,12 +1086,16 @@ do {
 	    } elsif ($pid == 0) { #child
 		$chroot_tmp .= "_" . int($i);
 		rebuild_one($dir, $srpm, $status);
+		dump_cache_par(\%run);
+		dump_status($local_spool, \%run);
 		exit;
 	    } else {
 		die "could not fork";
 	    }
 	} else {
 	    rebuild_one($dir, $srpm, $status);
+	    dump_cache_par(\%run);
+	    dump_status($local_spool, \%run);
 	}
     }
     if ($run{parallel}) {
-- 
cgit v1.2.1