admin: show failing directory

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

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 29388ad6ddd10b7f352f143c51d732b690291c8c..2b25cf0112d9bc99fab402c989e581e4d17203c0 100644 (file)
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -35,7 +35,7 @@ sub resolve_repo_dir {
                        local $/;
                        <$fh>;
                };
-               close $fh or die "error in $cmd: $!\n";
+               close $fh or die "error in $cmd (cwd:$cd): $!\n";
                chomp $dir;
                $$ver = 1 if $ver;
                return abs_path($cd) if ($dir eq '.' && defined $cd);
@@ -101,7 +101,14 @@ sub resolve_inboxes ($;$) {
                $cfg->each_inbox(sub {
                        my ($ibx) = @_;
                        $ibx->{version} ||= 1;
-                       $dir2ibx{abs_path($ibx->{mainrepo})} = $ibx;
+                       my $path = abs_path($ibx->{mainrepo});
+                       if (defined($path)) {
+                               $dir2ibx{$path} = $ibx;
+                       } else {
+                               warn <<EOF;
+W: $ibx->{name} $ibx->{mainrepo}: $!
+EOF
+                       }
                });
        }
        if ($opt->{all}) {
@@ -205,7 +212,7 @@ sub index_inbox {
                                $v2w->{parallel} = 0;
                        } else {
                                my $n = $v2w->{shards};
-                               if ($jobs != ($n + 1)) {
+                               if ($jobs != ($n + 1) && !$opt->{reshard}) {
                                        warn
 "Unable to respect --jobs=$jobs, inbox was created with $n shards\n";
                                }