From d6d442866106248eca072d2e19ffd1ae05883c14 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 20 Sep 2020 01:43:15 +0000 Subject: config: warn on multiple values for some fields Our code doesn't support multi-values for these, and having unexpected arrays leads to unexpected results (e.g. showing stuff like "ARRAY(0xDEADBEEFADD12E55)" in user interfaces). So warn and only use the last value (matching git-config(1) behavior without `--get-all'). (cherry picked from commit c8fe4673056571ed251c3a20cb0bbec586c60bd6) --- lib/PublicInbox/Config.pm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 8ccf337d..abc525db 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -364,13 +364,23 @@ sub _fill { my ($self, $pfx) = @_; my $ibx = {}; - foreach my $k (qw(inboxdir filter newsgroup - watch httpbackendmax - replyto feedmax nntpserver - indexlevel indexsequentialshard)) { + for my $k (qw(watch nntpserver)) { my $v = $self->{"$pfx.$k"}; $ibx->{$k} = $v if defined $v; } + for my $k (qw(filter inboxdir newsgroup replyto httpbackendmax feedmax + indexlevel indexsequentialshard)) { + if (defined(my $v = $self->{"$pfx.$k"})) { + if (ref($v) eq 'ARRAY') { + warn <[-1]' +EOF + $ibx->{$k} = $v->[-1]; + } else { + $ibx->{$k} = $v; + } + } + } # backwards compatibility: $ibx->{inboxdir} //= $self->{"$pfx.mainrepo"}; -- cgit v1.2.3-24-ge0c7