Changeset 1134 in ProjectBuilder for devel/pb

Timestamp:

Jan 5, 2011, 3:44:01 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix the sendmail require bug for announce command
• Fix warnings with param undefined for announce command

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -617 +617 @@
     require DBI;
     require DBD::SQLite;
-    require Mail::SendMail;
 
     pb_announce();
@@ -3069 +3068 @@
     
     # Preparation of headers
-    require Mail::Sendmail;
-
-    my %mail = (    
+    eval
+    {
+        require Mail::Sendmail;
+        Mail::Sendmail->import();
+    };
+    if ($@) {
+        # Mail::Sendmail not found not sending mail !
+        pb_log(0,"No Mail::Sendmail module found so not sending any mail !\n");
+    } else {
+        my %mail = (    
             To          =>  $pbml->{$ENV{'PBPROJ'}},
             From        =>  $pbpackager->{$ENV{'PBPROJ'}},
@@ -3079 +3085 @@
         );
             
-    # Send mail
-    if (! sendmail(%mail)) {
-        if ((defined $Mail::Sendmail::error) and (defined $Mail::Sendmail::log)) {
-            die "Unable to send mail ($Mail::Sendmail::error): $Mail::Sendmail::log";
+        # Send mail
+        if (! sendmail(%mail)) {
+            if ((defined $Mail::Sendmail::error) and (defined $Mail::Sendmail::log)) {
+                die "Unable to send mail ($Mail::Sendmail::error): $Mail::Sendmail::log";
+            }
         }
     }

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -106 +106 @@
 } elsif ($scheme =~ /^svn/) {
     # svnversion more precise than svn info if sbx
-    if ($param eq "CMS") {
+    if ((defined $param) && ($param eq "CMS")) {
         $tmp = `(LANGUAGE=C $vcscmd info $pburl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`;
         $tmp =~ s/\s+//;