From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 283A21F5A0 for ; Thu, 9 Feb 2023 21:54:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1675979674; bh=PhdvqO38fLssfK7k2BSGyWE9BwkMK0WSmb9B8wJim6Q=; h=From:To:Subject:Date:From; b=M+f2qTSmxhmKFm+o1aGmBY0vCFiiak8aXQzwhyv04vxnhpV52JnL4Wbwk9zkQukOx 9yiohJK+HQbLkdZPOxy4fzq+CQjkV3ePuG3vNIHLl6ariIJif2CfBui6LYBJHWR0DZ ns34CbrqJhrY8uYKQztpOiuQVL5DydPFlaQapriA= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] spawn_pp: fix incorrect `use' Date: Thu, 9 Feb 2023 21:53:20 +0000 Message-Id: <20230209215320.2849889-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We can't `use PublicInbox::Spawn' from SpawnPP because PublicInbox::Spawn loads SpawnPP from BEGIN. Fixes: 9eb8baf199cd148b (spawn_pp: use `which()' properly for pure-Perl spawn, 2023-01-29) --- lib/PublicInbox/SpawnPP.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/SpawnPP.pm b/lib/PublicInbox/SpawnPP.pm index 73859e9b..5609f74a 100644 --- a/lib/PublicInbox/SpawnPP.pm +++ b/lib/PublicInbox/SpawnPP.pm @@ -7,7 +7,7 @@ package PublicInbox::SpawnPP; use v5.12; use POSIX qw(dup2 _exit setpgid :signal_h); -use PublicInbox::Spawn qw(which); +# this is loaded by PublicInbox::Spawn, so we can't use/require it, here # Pure Perl implementation for folks that do not use Inline::C sub pi_fork_exec ($$$$$$$) { @@ -48,7 +48,7 @@ sub pi_fork_exec ($$$$$$$) { sigprocmask(SIG_SETMASK, $old) or die "SIG_SETMASK ~CHLD: $!"; $cmd->[0] = $f; if ($ENV{MOD_PERL}) { - $f = which('env'); + $f = PublicInbox::Spawn::which('env'); @$cmd = ('env', '-i', @$env, @$cmd); } else { %ENV = map { split(/=/, $_, 2) } @$env;