From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] config: do not nest multi-value altid arrays
Date: Fri, 12 Aug 2016 02:22:17 +0000 [thread overview]
Message-ID: <20160812022217.15072-1-e@80x24.org> (raw)
Oops. We will inevitably need to support multiple altids for a
public-inbox one day.
---
lib/PublicInbox/Config.pm | 2 +-
t/config.t | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index cd88548..5eae1f1 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -147,7 +147,7 @@ sub _fill {
}
foreach my $k (qw(altid)) { # TODO: more arrays
if (defined(my $v = $self->{"$pfx.$k"})) {
- $rv->{$k} = [ $v ];
+ $rv->{$k} = ref($v) eq 'ARRAY' ? $v : [ $v ];
}
}
diff --git a/t/config.t b/t/config.t
index 77e8f4a..073d1d0 100644
--- a/t/config.t
+++ b/t/config.t
@@ -50,4 +50,17 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
}, "lookup matches expected output for test");
}
+
+{
+ my $cfgpfx = "publicinbox.test";
+ my @altid = qw(serial:gmane:file=a serial:enamg:file=b);
+ my $config = PublicInbox::Config->new({
+ "$cfgpfx.address" => 'test@example.com',
+ "$cfgpfx.mainrepo" => '/path/to/non/existent',
+ "$cfgpfx.altid" => [ @altid ],
+ });
+ my $ibx = $config->lookup_name('test');
+ is_deeply($ibx->{altid}, [ @altid ]);
+}
+
done_testing();
--
EW
reply other threads:[~2016-08-12 2:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160812022217.15072-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).