- use DISTFILES: prefix in subjects

- From: requester

Changed files:
    file-fetcher.pl -> 1.16
    request-handler.pl -> 1.9

diff --git a/file-fetcher.pl b/file-fetcher.pl
index 3c88d20c4c15dfbee8c1157903fe1f96b780db5b..27c45b9602f058ee5a75ff211b3bc4f309649876 100644 (file)
--- a/file-fetcher.pl
+++ b/file-fetcher.pl
@@ -233,11 +233,13 @@ sub send_email()
   if ($problems ne "") {
     $marker = "ERRORS";
   }
+  my $req_login;
+  $requester =~ /^(.*)\@/ and $req_login = $1;
   print EMAIL 
-"From: distfiles <feedback\@pld-linux.org>
+"From: $req_login <$requester>
 To: $commits_list
 Cc: $requester
-Subject: [distfiles] sources fetched $marker
+Subject: DISTFILES: sources fetched $marker
 Message-ID: <$$." . time . "\@distfiles.pld-linux.org>
 X-distfiles-program: file-fetcher.pl
 X-distfiles-version: " . '$Id$' . "

diff --git a/request-handler.pl b/request-handler.pl
index aed4fe54177aeb7b7cdb7b62b983d368d7721462..6cdfa067c4d187d8995ba7be20c4afce29763546 100644 (file)
--- a/request-handler.pl
+++ b/request-handler.pl
@@ -61,11 +61,11 @@ sub report_fatal($)
   #open(M, "| cat") or die;
   my $version = '$Id$';
   print M <<EOF
-From: distfiles <feedback\@pld-linux.org>
+From: $from <$from\@pld-linux.org>
 To: $commits_list
 Cc: $from\@pld-linux.org
 Message-ID: <$id\@distfiles.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
 X-distfiles-version: $version