Changeset 477 in ProjectBuilder

Timestamp:

Jun 5, 2008, 1:03:08 AM (17 years ago)

Author:

Bruno Cornec

Message:

use Mail::Sendmail instead of mutt to deliver mail (From: header issue)

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -29 +29 @@
 use ProjectBuilder::Changelog;
 
+# For announce only
 use DBI;
+use Mail::Sendmail;
 
 # Global variables
@@ -1716 +1718 @@
 
     # Get all required parameters
-    my ($pbpackager,$pbrepo,$pbml) = pb_conf_get("pbpackager","pbrepo","pbml");
+    my ($pbpackager,$pbrepo,$pbml,$pbsmtp) = pb_conf_get("pbpackager","pbrepo","pbml","pbsmtp");
     my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
     my $pkg = pb_cms_get_pkg($defpkgdir,$extpkgdir);
@@ -1879 +1881 @@
     close(ML);
 
-    pb_system("export EMAIL=\'$pbpackager->{$ENV{'PBPROJ'}}\' ; mutt -s \"ANNOUNCE: Project $ENV{'PBPROJ'} version $ENV{'PBPROJVER'} is now available\" $pbml->{$ENV{'PBPROJ'}} < $ENV{'PBTMP'}/announce.txt","Mailing announce to $pbml->{$ENV{'PBPROJ'}}");
+    # To read whole file
+    local $/;
+    open(ANN,"$ENV{'PBTMP'}/announce.txt") || die "Unable to read $ENV{'PBTMP'}/announce.txt: $!";
+    my $msg = <ANN>;
+    close(ANN);
+    
+    # Preparation of headers
+
+    my %mail = (    
+            To          =>  $pbml->{$ENV{'PBPROJ'}},
+            From        =>  $pbpackager->{$ENV{'PBPROJ'}},
+            Smtp        =>  $pbsmtp->{$ENV{'PBPROJ'}},
+            Body        =>  $msg,
+            Subject     =>  "ANNOUNCE: Project $ENV{'PBPROJ'} version $ENV{'PBPROJVER'} is now available",
+        );
+            
+    # Send mail
+    sendmail(%mail) or die "Unable to send mail ($Mail::Sendmail::error): $Mail::Sendmail::log";
 }