diff options
author | Eric Wong <e@80x24.org> | 2021-10-13 07:00:35 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-10-13 19:51:18 +0000 |
commit | 6bb8478c8dacf83492de3afe15a615d646f0904f (patch) | |
tree | 0e1aaf64816b118f4890509b86caf043e4c7fa7c /lib/PublicInbox/LeiImport.pm | |
parent | 759493eb1eb737e9dedd30b8280bc4067077c615 (diff) | |
download | public-inbox-6bb8478c8dacf83492de3afe15a615d646f0904f.tar.gz |
warn() is easier to augment with context information, and frankly unavoidable in the presence of 3rd-party libraries we don't control.
Diffstat (limited to 'lib/PublicInbox/LeiImport.pm')
-rw-r--r-- | lib/PublicInbox/LeiImport.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index 69d63ab6..2f8fd6c6 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -38,7 +38,7 @@ sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn my $lse = $self->{lse} //= $self->{lei}->{sto}->search; my $lms = $self->{-lms_ro} //= $self->{lei}->lms; # may be 0 or undef my @oidbin = $lms ? $lms->name_oidbin($folder, $bn) : (); - @oidbin > 1 and $self->{lei}->err("W: $folder/*/$$bn not unique:\n", + @oidbin > 1 and warn("W: $folder/*/$$bn not unique:\n", map { "\t".unpack('H*', $_)."\n" } @oidbin); my %seen; my @docids = sort { $a <=> $b } grep { !$seen{$_}++ } @@ -100,9 +100,8 @@ sub do_import_index ($$@) { my $nproc = $self->detect_nproc; $j = $nproc if $j > $nproc; } - if ($lei->{opt}->{'new-only'} && (!$net || !$net->{imap_order})) { - $lei->err('# --new-only is only for IMAP'); - } + ($lei->{opt}->{'new-only'} && (!$net || !$net->{imap_order})) and + warn "# --new-only is only for IMAP\n"; my $ops = {}; $lei->{auth}->op_merge($ops, $self) if $lei->{auth}; $lei->{-eml_noisy} = 1; |