diff options
| author | Eric Wong <e@80x24.org> | 2023-02-09 21:53:20 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2023-02-09 22:09:40 +0000 |
| commit | 5541df4f6dbf7d58590a65cff39288e6005228b0 (patch) | |
| tree | f0f5dcd75e517b174f438ab0f4494b6fd452c986 | |
| parent | 0830817c132cb105291104937a645d30efe06db1 (diff) | |
| download | public-inbox-5541df4f6dbf7d58590a65cff39288e6005228b0.tar.gz | |
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)
| -rw-r--r-- | lib/PublicInbox/SpawnPP.pm | 4 |
1 files 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; |