X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAdmin.pm;h=e9fb5d6f1d53b42043ff6393d014b446aa16e250;hb=3c39f9c942a6975245fda878e9b957d8d3367662;hp=8a2f20431c1ba403bbfc6a95dbe6c9dbd443105d;hpb=d9aad3a7988262b31ab2171f2c982daf04ac822c;p=public-inbox.git

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 8a2f2043..e9fb5d6f 100644
--- 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);
@@ -61,7 +61,7 @@ sub detect_indexlevel ($) {
 			$l = $m;
 		} elsif ($m ne '') {
 			warn <<"";
-$ibx->{mainrepo} has unexpected indexlevel in Xapian: $m
+$ibx->{inboxdir} has unexpected indexlevel in Xapian: $m
 
 		}
 	}
@@ -74,7 +74,7 @@ sub unconfigured_ibx ($$) {
 	PublicInbox::Inbox->new({
 		name => $name,
 		address => [ "$name\@example.com" ],
-		mainrepo => $dir,
+		inboxdir => $dir,
 		# TODO: consumers may want to warn on this:
 		#-unconfigured => 1,
 	});
@@ -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->{inboxdir});
+			if (defined($path)) {
+				$dir2ibx{$path} = $ibx;
+			} else {
+				warn <<EOF;
+W: $ibx->{name} $ibx->{inboxdir}: $!
+EOF
+			}
 		});
 	}
 	if ($opt->{all}) {
@@ -204,10 +211,10 @@ sub index_inbox {
 			if ($jobs == 0) {
 				$v2w->{parallel} = 0;
 			} else {
-				my $n = $v2w->{partitions};
-				if ($jobs != ($n + 1)) {
+				my $n = $v2w->{shards};
+				if ($jobs != ($n + 1) && !$opt->{reshard}) {
 					warn
-"Unable to respect --jobs=$jobs, inbox was created with $n partitions\n";
+"Unable to respect --jobs=$jobs, inbox was created with $n shards\n";
 				}
 			}
 		}