[freeside-commits] branch master updated. 4c07c048c76c1aa8fe0f7aa8e8de7243ba60d777

[Ivan]

The branch, master has been updated
       via  4c07c048c76c1aa8fe0f7aa8e8de7243ba60d777 (commit)
      from  aa7d05879906fde83caf3989d288c4e42de6df86 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4c07c048c76c1aa8fe0f7aa8e8de7243ba60d777
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri May 10 14:26:05 2013 -0700

    add -s flag to skip CDR files that error out, RT#20763

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 15636af..3886c33 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1697,7 +1697,7 @@ sub batch_import {
 
     my $data = slurp($file);
     my $asn_output = $parser->decode( $data )
-      or die "No ". $asn_format->{'macro'}. " found\n";
+      or return "No ". $asn_format->{'macro'}. " found\n";
 
     $asn_header_buffer = &{ $asn_format->{'header_buffer'} }( $asn_output );
 
@@ -1881,7 +1881,7 @@ sub batch_import {
     return "Empty file!";
   }
 
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;;
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   ''; #no error
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Record.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)