lei: pass client stderr to git-config in more places

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

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index fca11ccff037cae4d5b1f4b37e609c36733629fa..8689b825a0beb397e30389abdd27a80f3a68aafe 100644 (file)
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -16,7 +16,7 @@ sub do_finish_mirror { # dwaitpid callback
        if ($?) {
                $lei->child_error($?);
        } elsif (!unlink($f)) {
-               $lei->err("unlink($f): $!");
+               $lei->err("unlink($f): $!") unless $!{ENOENT};
        } else {
                $lei->add_external_finish($mrr->{dst});
                $lei->qerr("# mirrored $mrr->{src} => $mrr->{dst}");
@@ -110,7 +110,7 @@ sub _try_config {
        }
        return $lei->err("# @$cmd failed (non-fatal)") if $cerr;
        rename($f, $ce) or return $lei->err("link($f, $ce): $! (non-fatal)");
-       my $cfg = PublicInbox::Config->git_config_dump($f);
+       my $cfg = PublicInbox::Config->git_config_dump($f, $lei->{2});
        my $ibx = $self->{ibx} = {};
        for my $sec (grep(/\Apublicinbox\./, @{$cfg->{-section_order}})) {
                for (qw(address newsgroup nntpmirror)) {
@@ -136,7 +136,7 @@ sub index_cloned_inbox {
        }
        # force synchronous dwaitpid for v2:
        local $PublicInbox::DS::in_loop = 0;
-       my $cfg = PublicInbox::Config->new;
+       my $cfg = PublicInbox::Config->new(undef, $lei->{2});
        my $env = PublicInbox::Admin::index_prepare($opt, $cfg);
        local %ENV = (%ENV, %$env) if $env;
        PublicInbox::Admin::progress_prepare($opt, $lei->{2});