diff options
author | Eric Wong <e@80x24.org> | 2023-03-21 23:07:41 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2023-03-25 09:38:01 +0000 |
commit | 13c94e1c0f9e9c66b329c801bede3348ea267b22 (patch) | |
tree | e60e7841fd10f613c06829a4a7ccf2c6807c1553 | |
parent | c5326285533c6e90172aa5fd294c593a49345f27 (diff) | |
download | public-inbox-13c94e1c0f9e9c66b329c801bede3348ea267b22.tar.gz |
Some options don't make sense when used together.
-rw-r--r-- | lib/PublicInbox/CodeSearchIdx.pm | 2 | ||||
-rwxr-xr-x | script/public-inbox-cindex | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm index 5e6c0d22..21c43973 100644 --- a/lib/PublicInbox/CodeSearchIdx.pm +++ b/lib/PublicInbox/CodeSearchIdx.pm @@ -734,7 +734,7 @@ sub cidx_run { # main entry point $m =~ s/\A(#?\s*)/$1$self->{current_info}: /; $cb->($m, @_); }; - load_existing($self); + load_existing($self) unless $self->{-internal}; local $REINDEX; if ($self->{-opt}->{reindex}) { require PublicInbox::SharedKV; diff --git a/script/public-inbox-cindex b/script/public-inbox-cindex index e2500b93..f8a3ebbb 100755 --- a/script/public-inbox-cindex +++ b/script/public-inbox-cindex @@ -53,6 +53,11 @@ if (defined(my $pl = $opt->{'project-list'})) { my $pfx = shift @ARGV // die <<EOM; PROJECTS_ROOT required for --project-list EOM + @ARGV and die <<EOM; +--project-list does not accept additional directories +(@ARGV) +beyond `$pfx' +EOM open my $fh, '<', $pl or die "open($pl): $!\n"; chomp(@git_dirs = <$fh>); $_ = PublicInbox::Admin::resolve_git_dir("$pfx/$_") for @git_dirs; @@ -67,6 +72,9 @@ if (defined $cidx_dir) { # external index } elsif (!@git_dirs) { die $help } else { + die <<EOM if $opt->{update}; +--update requires `-d EXTDIR' +EOM for my $gd (@git_dirs) { my $cd = "$gd/public-inbox-cindex"; my $cidx = PublicInbox::CodeSearchIdx->new($cd, { %$opt }); |