From 7c973b4958c95a3cc1a49d5e70657f49882679bc Mon Sep 17 00:00:00 2001
From: Gustavo De Nardin <spuk@mandriva.org>
Date: Tue, 8 May 2007 06:22:34 +0000
Subject: fixing the Big SVN Breakage: reverting last commit, restoring state
 as of latest working checkout in ken

---
 lib/Youri/Submit/Reject/Mail.pm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/Youri/Submit/Reject')

diff --git a/lib/Youri/Submit/Reject/Mail.pm b/lib/Youri/Submit/Reject/Mail.pm
index cee5a19..c20a832 100644
--- a/lib/Youri/Submit/Reject/Mail.pm
+++ b/lib/Youri/Submit/Reject/Mail.pm
@@ -54,19 +54,15 @@ sub run {
     my ($self, $package, $errors, $repository, $target, $define) = @_;
     croak "Not a class method" unless ref $self;
 
-    my $from = $package->get_packager();
     my $section = $repository->_get_section($package, $target, $define);
 
-    # force from adress if defined
-    $from =~ s/<.*>/<$self->{_from}>/ if $self->{_from};
-
     my $subject =
         ($self->{_prefix} ?  '[' . $self->{_prefix} . '] ' : '' ) . ($section ? "$section " : '') .
         $package->get_revision_name();
     my $information = $package->get_information();
     my $last_change = $package->get_last_change();
     my $author = $last_change->[Youri::Package::CHANGE_AUTHOR] if $last_change;
-    my $list = map { "- $_\n" } @{$last_change->[Youri::Package::CHANGE_TEXT]} if $last_change;
+    my $list = join('', map { "- $_\n" } @{$last_change->[Youri::Package::CHANGE_TEXT]}) if $last_change;
     my $content =
         "Errors: \n\n" . join("\n", map {
           ( "* $_", (map { "  - $_" } @{$errors->{$_}}), "\n");
@@ -84,7 +80,7 @@ sub run {
         Type     => 'text/plain',
         Charset  => $self->{_charset},
         Encoding => $self->{_encoding},
-        From     => $from,
+        From     => $self->{_from},
         To       => $self->{_to},
         Subject  => $subject,
         Data     => $content,
-- 
cgit v1.2.1