From ad26dcfbfc833984d670a9088d9f70a4f894a9a6 Mon Sep 17 00:00:00 2001 From: Ian Lumsden Date: Wed, 31 Jul 2024 12:36:51 -0700 Subject: flux-core,flux-sched: fix environments with external flux (#44775) --- var/spack/repos/builtin/packages/flux-core/package.py | 6 ++++++ var/spack/repos/builtin/packages/flux-sched/package.py | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index 3d0e128ee4..016ca57c8b 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -181,6 +181,12 @@ class FluxCore(AutotoolsPackage): env.append_path("LUA_PATH", "./?.lua", separator=";") def setup_run_environment(self, env): + # If this package is external, we expect the external provider to set things + # like LUA paths. So, we early return. If the package is not external, + # properly set these environment variables to make sure the user environment + # is configured correctly + if self.spec.external: + return env.prepend_path( "LUA_PATH", os.path.join(self.spec.prefix, self.lua_share_dir, "?.lua"), separator=";" ) diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index 3f97fb0d76..d75024e041 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -166,6 +166,12 @@ class FluxSched(CMakePackage, AutotoolsPackage): return os.path.join("lib", "lua", str(self.lua_version)) def setup_run_environment(self, env): + # If this package is external, we expect the external provider to set + # things like LUA paths. So, we early return. If the package is not + # external, properly set these environment variables to make sure the + # user environment is configured correctly + if self.spec.external: + return env.prepend_path( "LUA_PATH", os.path.join(self.spec.prefix, self.lua_share_dir, "?.lua"), separator=";" ) -- cgit v1.2.3-70-g09d2