spawn (and thus popen_rd) die on failure

[public-inbox.git] / lib / PublicInbox / Config.pm

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 8ecf549d47a42b8bc07c859389effb4adef3722d..56d146c2292f4cf83bc53936ffe4dffcb41e1dd4 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -10,7 +10,7 @@
 package PublicInbox::Config;
 use strict;
 use warnings;
-require PublicInbox::Inbox;
+use PublicInbox::Inbox;
 use PublicInbox::Spawn qw(popen_rd);
 
 sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] }
@@ -158,7 +158,7 @@ sub git_config_dump {
        return {} unless -e $file;
        my @cmd = (qw/git config -z -l/, "--file=$file");
        my $cmd = join(' ', @cmd);
-       my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
+       my $fh = popen_rd(\@cmd);
        my $rv = config_fh_parse($fh, "\0", "\n");
        close $fh or die "failed to close ($cmd) pipe: $?";
        $rv;
@@ -362,8 +362,8 @@ sub _fill {
        my ($self, $pfx) = @_;
        my $ibx = {};
 
-       foreach my $k (qw(inboxdir filter url newsgroup
-                       infourl watch watchheader httpbackendmax
+       foreach my $k (qw(inboxdir filter newsgroup
+                       watch watchheader httpbackendmax
                        replyto feedmax nntpserver indexlevel)) {
                my $v = $self->{"$pfx.$k"};
                $ibx->{$k} = $v if defined $v;
@@ -383,7 +383,8 @@ sub _fill {
        }
        # TODO: more arrays, we should support multi-value for
        # more things to encourage decentralization
-       foreach my $k (qw(address altid nntpmirror coderepo hide listid)) {
+       foreach my $k (qw(address altid nntpmirror coderepo hide listid url
+                       infourl)) {
                if (defined(my $v = $self->{"$pfx.$k"})) {
                        $ibx->{$k} = _array($v);
                }