Differentiate "From:" when sending separate emails

diff --git a/file-fetcher.pl b/file-fetcher.pl
index 3b08f279414ce0ec712385e1ea1572310031f0e3..e5d4b6b73eebfe39a0043dc3af5aad8d0dbdf999 100755 (executable)
--- a/file-fetcher.pl
+++ b/file-fetcher.pl
@@ -368,10 +368,8 @@ sub send_email()
   splice(@files, 10, @files - 10, "...")
     if (@files > 10);
 
-  my $message_id = 
   my $email_head =
-"From: $req_login <$requester>
-Subject: DISTFILES: ${spec}: ${marker}@{files}
+"Subject: DISTFILES: ${spec}: ${marker}@{files}
 X-distfiles-program: file-fetcher.pl";
   my $email_body =
 "$problems
@@ -388,7 +386,8 @@ Virtually Yours: distfiles.
   #open(EMAIL, "| cat");
 
   print EMAIL
-"To: $requester
+"From: <distfiles\@distfiles.pld-linux.org>
+To: $requester
 $email_head
 Message-ID: <$$." . time . "\@distfiles.pld-linux.org>
 
@@ -401,11 +400,12 @@ $email_body";
   #open(EMAIL, "| cat");
 
   print EMAIL
-"To: $commits_list
+"From: $req_login <$requester>
+To: $commits_list
 $email_head
 Message-ID: <$$." . time . "\@distfiles.pld-linux.org>
 
-Request by: $requester
+Request by: $req_login
 
 $email_body";
 

diff --git a/request-handler.pl b/request-handler.pl
index 88597302588c6604bce06a7cd4731742b15469bf..6e03efb8af953377b42b668c7eafd0ea9558235f 100755 (executable)
--- a/request-handler.pl
+++ b/request-handler.pl
@@ -31,8 +31,7 @@ sub report_fatal($)
   cleanup();
 
   my $email_head =
-"From: $from <$from\@pld-linux.org>
-Subject: DISTFILES: ERROR fetching sources for $spec ($branch)
+"Subject: DISTFILES: ERROR fetching sources for $spec ($branch)
 X-distfiles-program: request-handler.pl";
   my $email_body =
 "$msg
@@ -44,17 +43,21 @@ Virtually Yours: distfiles.
   open(M, "| /usr/sbin/sendmail -t") or die("/usr/sbin/sendmail not found");
   #open(M, "| cat") or die;
   print M
-"To: $commits_list
+"From: $from <$from\@pld-linux.org>
+To: $commits_list
 $email_head
 Message-ID: <$$." . time . "$id\@distfiles.pld-linux.org>
 
+Requester: $from
+
 $email_body";
   close(M) or die("problem while sending email");
   
   open(M, "| /usr/sbin/sendmail -t") or die("/usr/sbin/sendmail not found");
   #open(M, "| cat") or die;
   print M
-"To: <$from\@pld-linux.org>
+"From: <distfiles\@distfiles.pld-linux.org>
+To: <$from\@pld-linux.org>
 $email_head
 Message-ID: <$$." . time . "$id\@distfiles.pld-linux.org>