freeside/FS/FS cust_bill.pm,1.41.2.46,1.41.2.47

[ivan]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory pouncequick:/tmp/cvs-serv1899

Modified Files:
      Tag: FREESIDE_1_4_BRANCH
	cust_bill.pm 
Log Message:
as an invoice event, emailing/printing problems should be fatal and trigger retry

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.41.2.46
retrieving revision 1.41.2.47
diff -u -d -r1.41.2.46 -r1.41.2.47
--- cust_bill.pm	30 Mar 2004 16:45:48 -0000	1.41.2.46
+++ cust_bill.pm	21 Apr 2004 20:52:40 -0000	1.41.2.47
@@ -417,9 +417,9 @@
     $!=0;
     $message->smtpsend( Host => $smtpmachine )
       or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-        or return "(customer # ". $self->custnum. ") can't send invoice email".
-                  " to ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
-                  " via server $smtpmachine with SMTP: $!";
+        or die "(customer # ". $self->custnum. ") can't send invoice email".
+               " to ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
+               " via server $smtpmachine with SMTP: $!\n";
 
   }
 
@@ -429,11 +429,11 @@
 
   if ( grep { $_ eq 'POST' } @invoicing_list ) { #postal
     open(LPR, "|$lpr")
-      or return "Can't open pipe to $lpr: $!";
+      or die "Can't open pipe to $lpr: $!\n";
     print LPR @print_text;
     close LPR
-      or return $! ? "Error closing $lpr: $!"
-                   : "Exit status $? from $lpr";
+      or die $! ? "Error closing $lpr: $!\n"
+                : "Exit status $? from $lpr\n";
   }
 
   '';