From dfb7216697548f294259cb010c26416cdbbe0ff0 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 28 Nov 2022 05:31:22 +0000 Subject: [PATCH] lei_mirror: retrieve v2 description properly --- lib/PublicInbox/LeiMirror.pm | 2 +- t/www_listing.t | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index 44d7a524..9c457fca 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -449,7 +449,7 @@ failed to extract epoch number from $src $lei->{opt}->{'inbox-config'} =~ /\A(?:always|v2)\z/s and _get_txt_start($task, '_/text/config/raw', $fini); - _get_txt_start($self, 'description', $fini); + _get_txt_start($task, 'description', $fini); $task->{-locked} = $lk->lock_for_scope($$) if !$self->{dry_run}; my @cmd = clone_cmd($lei, my $opt = {}); diff --git a/t/www_listing.t b/t/www_listing.t index 45287c7d..6166b94e 100644 --- a/t/www_listing.t +++ b/t/www_listing.t @@ -91,6 +91,10 @@ SKIP: { is(xsys(@clone, $alt, "$v2/git/$i.git"), 0, "clone epoch $i") } ok(open(my $fh, '>', "$v2/inbox.lock"), 'mock a v2 inbox'); + open($fh, '>', "$v2/description") or xbail "open $v2/description: $!"; + print $fh "a v2 inbox\n" or xbail "print $!"; + close $fh or xbail "write: $v2/description $!"; + open $fh, '>', "$alt/description" or xbail "open $alt/description $!"; print $fh "we're \xc4\x80ll clones\n" or xbail "print $!"; close $fh or xbail "write: $alt/description $!"; @@ -143,6 +147,9 @@ EOM /v2/git/1.git /v2/git/2.git) ], 'manifest saved'); for (keys %$mf) { ok(-d "$tmpdir/pfx$_", "pfx/$_ cloned") } + open my $desc, '<', "$tmpdir/pfx/v2/description" or xbail "open: $!"; + $desc = <$desc>; + is($desc, "a v2 inbox\n", 'v2 description retrieved'); $clone_err = ''; ok(run_script(['-clone', '--include=*/alt', -- 2.44.0