diff options
author | Eric Wong <e@80x24.org> | 2020-12-21 07:51:20 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-12-21 21:51:57 +0000 |
commit | 3e9888ed30b7fe092b03789d19a8020d4bc0fb39 (patch) | |
tree | fcdb2a81886f3526ddaa09c674eea308310bef6b /script | |
parent | bad84119fb0915abe3f19fe4fb9c34e24fe7e564 (diff) | |
download | public-inbox-3e9888ed30b7fe092b03789d19a8020d4bc0fb39.tar.gz |
We need to canonicalize paths for inboxes which do not have a newsgroup defined, otherwise ->eidx_key matches can fail in unexpected ways.
Diffstat (limited to 'script')
-rwxr-xr-x | script/public-inbox-convert | 2 | ||||
-rwxr-xr-x | script/public-inbox-init | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/script/public-inbox-convert b/script/public-inbox-convert index fbd527a6..800c364c 100755 --- a/script/public-inbox-convert +++ b/script/public-inbox-convert @@ -75,7 +75,7 @@ if ($opt->{'index'}) { } local %ENV = (%$env, %ENV) if $env; my $new = { %$old }; -$new->{inboxdir} = PublicInbox::Admin::rel2abs_collapsed($new_dir); +$new->{inboxdir} = $cfg->rel2abs_collapsed($new_dir); $new->{version} = 2; $new = PublicInbox::InboxWritable->new($new, { nproc => $opt->{jobs} }); $new->{-no_fsync} = 1 if !$opt->{fsync}; diff --git a/script/public-inbox-init b/script/public-inbox-init index eb605a51..afaa4c12 100755 --- a/script/public-inbox-init +++ b/script/public-inbox-init @@ -138,7 +138,7 @@ close($fh) or die "failed to close $pi_config_tmp: $!\n"; my $pfx = "publicinbox.$name"; my @x = (qw/git config/, "--file=$pi_config_tmp"); -PublicInbox::Admin::rel2abs_collapsed($inboxdir); +PublicInbox::Config::rel2abs_collapsed($inboxdir); die "`\\n' not allowed in `$inboxdir'\n" if index($inboxdir, "\n") >= 0; if (-f "$inboxdir/inbox.lock") { |