diff options
| -rwxr-xr-x | emi | 11 | ||||
| -rwxr-xr-x | ulri | 10 |
2 files changed, 7 insertions, 14 deletions
@@ -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 @@ -122,11 +122,6 @@ my %config_usage = ( }, }, }, - # this is weird to me, guessing email addresses? -spuk - default_mail_domain => { - desc => "Default mail domain to append", - default => 'mandriva.org' - }, faildelay => { desc => "Time after which the rebuild is considered as a failure", default => 36000 @@ -488,13 +483,14 @@ foreach my $prefix (keys %pkg_tree) { $text .= "- $srpm\n"; } - my $to = get_author_email($user) || "$user\@$config->{default_mail_domain}"; + my $to = get_author_email($user) || "Unknown <$config->{admin}>"; + my $cc = undef; my $fpath = "$config->{http_queue}/failure/$path/$prefix"; $fpath =~ tr!/!!s; # Squash double slashes ... $fpath =~ s!/!//!; # ... except for http:// $text .= "\nFailure details available in $fpath\n"; - sendmail($to, $config->{admin}, + sendmail($to, $cc, "Rebuild failed on $arch for $srpms", $text, "Ulri the scheduler bot <$config->{admin}>", 0); } |