diff options
| author | Eric Wong <e@80x24.org> | 2021-03-20 07:38:00 +0500 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-03-20 02:48:02 +0000 |
| commit | 592daf02926f747bacaa85a1d1509374c7e66f11 (patch) | |
| tree | 92703a8c49aed77aedea14c1c9b0795f3a7fff6e | |
| parent | 8d77e9e1ac618c5fb33492200ee50fd1b12a7b57 (diff) | |
| download | public-inbox-592daf02926f747bacaa85a1d1509374c7e66f11.tar.gz | |
This was causing errors in a mass keyword import patch I'm working on.
| -rw-r--r-- | lib/PublicInbox/IPC.pm | 1 | ||||
| -rw-r--r-- | lib/PublicInbox/LEI.pm | 8 | ||||
| -rw-r--r-- | lib/PublicInbox/LeiStore.pm | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm index 1fa67d00..cf3723f7 100644 --- a/lib/PublicInbox/IPC.pm +++ b/lib/PublicInbox/IPC.pm @@ -177,6 +177,7 @@ sub ipc_worker_stop { # and writing to the same store sub ipc_lock_init { my ($self, $f) = @_; + $f // die 'BUG: no filename given'; require PublicInbox::Lock; $self->{-ipc_lock} //= bless { lock_path => $f }, 'PublicInbox::Lock' } diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index a0986f38..d20ba744 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -83,7 +83,7 @@ sub rel2abs ($$) { File::Spec->rel2abs($p, $pwd); } -sub _store_path ($) { +sub store_path ($) { my ($self) = @_; rel2abs($self, ($self->{env}->{XDG_DATA_HOME} // ($self->{env}->{HOME} // '/nonexistent').'/.local/share') @@ -188,7 +188,7 @@ our %CMD = ( # sorted in order of importance/use: }, qw(config-file|system|global|file|f=s), # for conflict detection qw(C=s@), pass_through('git config') ], 'init' => [ '[DIRNAME]', sub { - "initialize storage, default: "._store_path($_[0]); + "initialize storage, default: ".store_path($_[0]); }, qw(quiet|q C=s@) ], 'daemon-kill' => [ '[-SIGNAL]', 'signal the lei-daemon', # "-C DIR" conflicts with -CHLD, here, and chdir makes no sense, here @@ -640,7 +640,7 @@ sub _lei_store ($;$) { $cfg->{-lei_store} //= do { require PublicInbox::LeiStore; my $dir = $cfg->{'leistore.dir'}; - $dir //= $creat ? _store_path($self) : return; + $dir //= $creat ? store_path($self) : return; PublicInbox::LeiStore->new($dir, { creat => $creat }); }; } @@ -689,7 +689,7 @@ sub lei_init { my ($self, $dir) = @_; my $cfg = _lei_cfg($self, 1); my $cur = $cfg->{'leistore.dir'}; - $dir //= _store_path($self); + $dir //= store_path($self); $dir = rel2abs($self, $dir); my @cur = stat($cur) if defined($cur); $cur = File::Spec->canonpath($cur // $dir); diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index ae263914..26f975c3 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -261,7 +261,7 @@ sub write_prepare { my ($self, $lei) = @_; unless ($self->{-ipc_req}) { require PublicInbox::LeiXSearch; - $self->ipc_lock_init; + $self->ipc_lock_init($lei->store_path . '/ipc.lock'); # Mail we import into lei are private, so headers filtered out # by -mda for public mail are not appropriate local @PublicInbox::MDA::BAD_HEADERS = (); |