add postal.pm condition, RT#12557

[freeside.git] / FS / FS / Misc.pm

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index fe8ac60..a55f4a9 100644 (file)
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -323,9 +323,9 @@ sub generate_email {
 
   my $data;
   if ( ref($args{'text_body'}) eq 'ARRAY' ) {
-    $data = $args{'text_body'};
+    $data = join("\n", @{ $args{'text_body'} });
   } else {
-    $data = [ split(/\n/, $args{'text_body'}) ];
+    $data = $args{'text_body'};
   }
 
   $alternative->attach(
@@ -767,10 +767,13 @@ sub _pslatex {
 
     local($SIG{CHLD}) = sub {};
     run( \@cmd, '>'=>'/dev/null', '2>'=>'/dev/null', timeout($timeout) )
-      or die "pslatex $file.tex failed; see $file.log for details?\n";
+      or warn "bad exit status from pslatex pass $_\n";
 
   }
 
+  return if -e "$file.dvi" && -s "$file.dvi";
+  die "pslatex $file.tex failed; see $file.log for details?\n";
+
 }
 
 =item print ARRAYREF