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.1 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 335B31F61C for ; Mon, 12 Dec 2022 09:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1670839134; bh=rIbToDCehF/62DFu5am8ofHtSaJfmWnoI2ichD0C81w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=cA0l7n7lJck6Zfz1oCuwT5mE69qIbKx0mt2jIPSovIdCFegfTDcLGFG5eAA5nrpEz h9IQTrIN/D307PiMiwWFG+PyqF0fPZG7SL3Q6RaM0B+PgoyiwK6gamEQ6TZO4UWMkN ryavu2Fhtz/PROg/UAsh3Qh+bfZQPfaeRf98tZEg= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] lei_mirror: trim current symlinks from warning Date: Mon, 12 Dec 2022 09:58:53 +0000 Message-Id: <20221212095854.17921-2-e@80x24.org> In-Reply-To: <20221212095854.17921-1-e@80x24.org> References: <20221212095854.17921-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This quiets needless warnings from current symlinks, while still complaining about out-of-date ones. --- lib/PublicInbox/LeiMirror.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index 33cf55ab..d6d2c69e 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -707,6 +707,7 @@ sub update_ent { } if (my $symlinks = $self->{-ent}->{symlinks}) { my $top = File::Spec->rel2abs($self->{dst}); + push @{$self->{-new_symlinks}}, @$symlinks; for my $p (@$symlinks) { my $ln = "$top/$p"; $ln =~ tr!/!/!s; @@ -1007,6 +1008,8 @@ sub dump_project_list ($$) { $new{substr($_, 1)} = 1 for keys %$m; # drop leading '/' my @list = sort keys %new; my @remote = grep { !defined($new{$_}) } @list; + my %lnk = map { substr($_, 1) => undef } @{$self->{-new_symlinks}}; + @remote = grep { !exists($lnk{$_}) } @remote; warn <{src}: @@ -1058,6 +1061,7 @@ sub try_manifest { } local $self->{chg} = {}; local $self->{-local_manifest} = load_current_manifest($self); + local $self->{-new_symlinks} = []; my ($path_pfx, $n, $multi) = multi_inbox($self, \$path, $m); return $lei->child_error(1, $multi) if !ref($multi); my $v2 = delete $multi->{v2};