Only consider an arch done if we find a .done file

1 files changed, 13 insertions, 2 deletions

diff --git a/emi b/emi
index ac56fe2..0adb486 100755
--- a/emi
+++ b/emi
@@ -134,7 +134,6 @@ sub done_func {
 	plog('DEBUG', "found rpm $rpm ($prefix) for section $section");
 	$pkg_tree{$prefix}{target} = $f;
 	$pkg_tree{$prefix}{section}{$section}{path} = "/$f/$m/$s";
-	$pkg_tree{$prefix}{section}{$section}{arch}{$arch} = 1;
 	push @{$pkg_tree{$prefix}{section}{$section}{srpms}}, $rpm if $arch eq 'src';
 	push @{$pkg_tree{$prefix}{section}{$section}{rpms}} , $rpm;
     } elsif ($r =~ /(\d{14}\.\w+\.\w+\.\d+)_(.*)\.excluded$/) {
@@ -145,6 +144,18 @@ sub done_func {
     }
 }
 
+sub done_post {
+    my ($_todo, $f, $m, $s, $r) = @_;
+    my $section = "$m/$s";
+    if ($r =~ /(\d{14}\.\w+\.\w+\.\d+)_(.*\.done)$/) {
+	my ($prefix, $arch) = ($1, $2);
+	if (defined($pkg_tree{$prefix})) {
+	    plog('DEBUG', "found .done ($prefix, $arch)");
+	    $pkg_tree{$prefix}{section}{$section}{arch}{$arch} = 1;
+	}
+    }
+}
+
 sub todo_func {
     my ($_todo, $_f, $_m, $_s, $r) = @_;
 
@@ -155,7 +166,7 @@ sub todo_func {
     }
 }
 
-check_upload_tree(\%run, $done, \&done_func,);
+check_upload_tree(\%run, $done, \&done_func, \&done_post);
 check_upload_tree(\%run, $todo, \&todo_func,);