From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3CF852017F for ; Mon, 28 Nov 2022 05:32:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1669613558; bh=CqhSoM22xZie/UNdYlqdZIerb7la+enDfelLCun2oqI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=s8oZdBp0kMY2EY7Qnqolvno3C+Zd6vIKcPVOs1GQZcI3ACptJxUeQPxzh6ph/BtMN +DelKVsWeiBGQX6jyuIQn2S5Ib2vNN9powkIuwHqe3ZdF+iJ66mFDMyRV0YScz97GO av0gBevZvJZPbCFYvqmV4ua/GTGltghi02e4mhUQ= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 27/95] lei_mirror: allow --epoch on mixed v1/v2 clones Date: Mon, 28 Nov 2022 05:31:24 +0000 Message-Id: <20221128053232.291618-28-e@80x24.org> In-Reply-To: <20221128053232.291618-1-e@80x24.org> References: <20221128053232.291618-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: It's entirely possible an instance will have both v1 and v2 inboxes (or v2 inboxes and coderepos). Don't punish --epoch users by forcing them to run multiple commands. --- lib/PublicInbox/LeiMirror.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index 0a93ed44..ddb1e747 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -579,7 +579,8 @@ sub try_manifest { } my ($path_pfx, $n, $multi) = multi_inbox($self, \$path, $m); return $lei->child_error(1, $multi) if !ref($multi); - if (my $v2 = delete $multi->{v2}) { + my $v2 = delete $multi->{v2}; + if ($v2) { for my $name (sort keys %$v2) { my $epochs = delete $v2->{$name}; my %v2_epochs = map { @@ -605,6 +606,7 @@ EOM } } if (my $v1 = delete $multi->{v1}) { + delete local $lei->{opt}->{epoch} if defined($v2); my $p = $path_pfx.$path; chop($p) if substr($p, -1, 1) eq '/'; $uri->path($p);