summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2013-05-10 14:26:06 -0700
committerIvan Kohler <ivan@freeside.biz>2013-05-10 14:26:06 -0700
commit53587d38364bb25653f7df08b2cf1a7468d43c1f (patch)
tree75de3f3c071853c66e9587ae61e8b6cd6f900eb0
parent2272361a3302113bb43cbf4581e7187db25f3a58 (diff)
add -s flag to skip CDR files that error out, RT#20763
-rw-r--r--FS/FS/Record.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index bdf3bcf3a..87947f085 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