only includes the srpm in the mail subject; noarch is enough as mandatory arch

1 files changed, 6 insertions, 4 deletions

diff --git a/emi b/emi
index 4c70fbd..424262b 100755
--- a/emi
+++ b/emi
@@ -118,16 +118,15 @@ foreach my $prefix (keys %pkg_tree) {
     my $section = $pkg_tree{$prefix}{section};
     print {$run{LOG}} "$program_name: processing $prefix in $path\n";
     my %missing;
-    foreach my $mandatory_arch (@{$config->{mandatory_arch}}, 'src', 'noarch') {
+    foreach my $mandatory_arch (@{$config->{mandatory_arch}}, 'src') {
 	print {$run{LOG}} "$program_name: checking if mandatory architecture $mandatory_arch is present: ";
-	if (!$pkg_tree{$prefix}{arch}{$mandatory_arch} ){
+	if (!$pkg_tree{$prefix}{arch}{$mandatory_arch} && !$pkg_tree{$prefix}{arch}{noarch}){
 	    if (!$cache->{arch}{$prefix}{$mandatory_arch}) {
 		$missing{$mandatory_arch} = 1;
 		print {$run{LOG}} "no\n";
 		$ok = 0
 	    }	
 	} else {
-	    if ($mandatory_arch eq 'noarch') { $ok = 1 }
 	    print {$run{LOG}} "yes\n"
 	}
     }
@@ -149,7 +148,9 @@ foreach my $prefix (keys %pkg_tree) {
 		}
 	    }
 	    if ($all_uploaded) {
-		print {$run{LOG}} "Cleaning upload tree for $prefix\n";
+		print {$run{LOG}} "$program_name: cleaning upload tree for $prefix\n";
+		# remove srpm
+		# remove lock
 	    }
 	} else {
 	    # should send a mail or something
@@ -164,6 +165,7 @@ foreach my $prefix (keys %pkg_tree) {
 		my $text = qq{The upload of the following packages failed:\n};
 		my $rpms;
 		foreach my $rpm (@{$pkg_tree{$prefix}{rpms}}) {
+		    $rpm =~ /src\.rpm$/ or next;
 		    $rpms .= "$rpm ";
 		    $text .= "- $rpm\n"
 		}