diff options
| author | Eric Wong <e@80x24.org> | 2021-09-12 07:47:15 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-09-12 07:48:58 +0000 |
| commit | ce7053d091329b130ac107e64595d18cdbd26409 (patch) | |
| tree | f06ee42fcfa10f2fdd42ab67c371fdb9b121a6c8 | |
| parent | 9626c1a6b368dc09425c1d578ba9ce4efc1af9fc (diff) | |
| download | public-inbox-ce7053d091329b130ac107e64595d18cdbd26409.tar.gz | |
"Unnamed repository" for v1 inboxes was misleading, and having a non-existent description for v2 was equally annoying, so set a short description based on the primary address. We remove descriptions when setting up new test inboxes to preserve the behavior of the t/lei-mirror.t test case.
| -rw-r--r-- | lib/PublicInbox/TestCommon.pm | 3 | ||||
| -rwxr-xr-x | script/public-inbox-init | 6 | ||||
| -rw-r--r-- | t/init.t | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 2e3e9ecc..14dac03f 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -605,7 +605,8 @@ sub setup_public_inboxes () { run_script([qw(-init --skip-docdata), "-V$V", '--newsgroup', "t.v$V", "t$V", "$test_home/t$V", "http://example.com/t$V", - "t$V\@example.com" ]) or BAIL_OUT "init v$V"; + "t$V\@example.com" ]) or xbail "init v$V"; + unlink "$test_home/t$V/description" or xbail "unlink $!"; } require PublicInbox::Config; require PublicInbox::InboxWritable; diff --git a/script/public-inbox-init b/script/public-inbox-init index ced88235..78a4d3bd 100755 --- a/script/public-inbox-init +++ b/script/public-inbox-init @@ -246,3 +246,9 @@ if (defined $perm) { rename $pi_config_tmp, $pi_config or die "failed to rename `$pi_config_tmp' to `$pi_config': $!\n"; undef $auto_unlink; # trigger ->DESTROY + +my $f = "$inboxdir/description"; +if (sysopen $fh, $f, O_CREAT|O_EXCL|O_WRONLY) { + print $fh "public inbox for $address[0]\n" or die "print($f): $!"; + close $fh or die "close($f): $!"; +} @@ -99,6 +99,9 @@ sub quiet_fail { $err = ''; ok(run_script($cmd, $env, $rdr), 'initializes non-existent hierarchy'); ok(-d "$tmpdir/a/b/c/d", 'directory created'); + is(PublicInbox::Inbox::try_cat("$tmpdir/a/b/c/d/description"), + "public inbox for abcd\@example.com\n", 'description set'); + open my $fh, '>', "$tmpdir/d" or BAIL_OUT "open: $!"; close $fh; $cmd = [ '-init', 'd-f-conflict', "$tmpdir/d/f/conflict", |