- get rid of email guessing

- mail bot admin only in case the author cannot be found
- a bit more info in a log message

1 files changed, 4 insertions, 7 deletions

diff --git a/emi b/emi
index 46ff873..c7ab944 100755
--- a/emi
+++ b/emi
@@ -60,10 +60,6 @@ my %config_usage = (
 	desc => "Renaming of arch",
 	default => { 'sparc64' => 'sparcv9' }
     },
-    default_mail_domain => {
-	desc => "Default mail domain to append",
-	default => 'mandriva.org'
-    },
     http_queue => {
 	desc => 'Address where log can be consulted',
 	default => 'http://kenobi.mandriva.com/queue/'
@@ -219,7 +215,7 @@ foreach my $prefix (keys %pkg_tree) {
     plog('OK', "all archs done: $prefix");
     foreach my $rpm (@{$pkg_tree{$prefix}{rpms}}) {
 	push @packages, "$done/$path/${prefix}_$rpm";
-        plog('OK', " uploading $rpm");
+        plog('OK', " uploading $rpm in $done/$path");
     }
 
     $user ||= $config->{upload_user};
@@ -263,10 +259,11 @@ foreach my $prefix (keys %pkg_tree) {
 		$rpms .= "$rpm ";
 		$text .= "- $rpm\n";
 	    }
-	    my $to =  get_author_email($user) || "$user\@$config->{default_mail_domain}";
+	    my $to =  get_author_email($user) || "Unknown <$config->{admin}>";
+	    my $cc = undef;
 	    $text .= "\nUpload log available in $config->{http_queue}/rejected/$path/$prefix.youri\n";
 
-	    sendmail($to, $config->{admin} , "Upload failed for $rpms", $text, "Emi the upload bot <$config->{admin}>", 0);
+	    sendmail($to, $cc, "Upload failed for $rpms", $text, "Emi the upload bot <$config->{admin}>", 0);
 	}
 
 	# should delete the files