diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-05-10 14:26:05 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-05-10 14:26:05 -0700 |
| commit | 4c07c048c76c1aa8fe0f7aa8e8de7243ba60d777 (patch) | |
| tree | d62a94702e487e01e7f3dddcea7770ca0a461b5e /FS | |
| parent | aa7d05879906fde83caf3989d288c4e42de6df86 (diff) | |
add -s flag to skip CDR files that error out, RT#20763
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/Record.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm index 15636af9c..3886c3333 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 |