Align MANPATH handling in lmod.spec to preserve system man pages (#2070)

[Amrithasuresh]

Summary

This PR updates the lmod.spec file to align MANPATH handling

Changes

• Initialize MANPATH if unset to system defaults
• Use Lmod's 'addto' helper script to append Lmod man pages
• Applied changes in both bash (lmod.sh) and csh (lmod.csh) profile scripts
• Prevents module MANPATH overrides that hide system man pages (fixes manpath in modules #2070)

Related Issue

Fixes: #2070

Signed-off-by

Suresh Panneerselvam sureshcbt@gmail.com

[adrianreber]

@Amrithasuresh If you look at the result of the CI runs there will be an RPM which you can test locally to see if your change works as expected.

[adrianreber]

@mslacken

lmod fails to build on opensuse:

Problem: 1: the to be installed lmod-ohpc-8.7.53-27.ohpc.1.src requires 'apparmor-abstractions', but this requirement cannot be provided
not installable providers: apparmor-abstractions-3.0.4-150500.9.3.noarch[repo-oss]
                   apparmor-abstractions-3.0.4-150500.11.3.1.noarch[repo-sle-update]

I think this is related to your PR to fix things around apparmor. Any ides how this could be fixed?

[github-actions]

Test Results

 30 files   -  9  30 suites   - 9   37s ⏱️ -33s
 54 tests  - 21  50 ✅  - 21  4 💤 ±0  0 ❌ ±0 
102 runs   - 51  96 ✅  - 51  6 💤 ±0  0 ❌ ±0 

Results for commit 00a80bc. ± Comparison against base commit bf2f5cd.

This pull request removes 22 and adds 1 tests. Note that renamed tests count towards both.

rm_execution ‑ [libs/PHDF5] MPI C binary runs under resource manager (slurm/gnu14/mpich)
rm_execution ‑ [libs/PHDF5] MPI C binary runs under resource manager (slurm/gnu14/openmpi5)
rm_execution ‑ [libs/PHDF5] MPI C binary runs under resource manager (slurm/intel/mpich)
rm_execution ‑ [libs/PHDF5] MPI C binary runs under resource manager (slurm/intel/openmpi5)
rm_execution ‑ [libs/PHDF5] Parallel Fortran binary runs under resource manager (slurm/gnu14/mpich)
rm_execution ‑ [libs/PHDF5] Parallel Fortran binary runs under resource manager (slurm/gnu14/openmpi5)
rm_execution ‑ [libs/PHDF5] Parallel Fortran binary runs under resource manager (slurm/intel/mpich)
rm_execution ‑ [libs/PHDF5] Parallel Fortran binary runs under resource manager (slurm/intel/openmpi5)
test_module ‑ [HDF5] Verify HDF5 module is loaded and matches rpm version (gnu14)
test_module ‑ [HDF5] Verify HDF5 module is loaded and matches rpm version (intel)
…

lmod ‑ [lmod] test that the setup function passed

♻️ This comment has been updated with latest results.

[adrianreber]

@Amrithasuresh can you rebase this PR. The errors should be fixed.

[Amrithasuresh]

Sure. Will do.

[adrianreber]

Thanks for fixing this. Merged.

[adrianreber]

It required a fixup:

diff --git a/components/admin/lmod/SPECS/lmod.spec b/components/admin/lmod/SPECS/lmod.spec
index e3af2b423..a323a64b1 100644
--- a/components/admin/lmod/SPECS/lmod.spec
+++ b/components/admin/lmod/SPECS/lmod.spec
@@ -116,7 +116,7 @@ if [ -z "\${MANPATH:-}" ]; then
     export MANPATH=":"
 fi
 # Initialize MANPATH if unset, then safely append Lmod's man directory using addto helper
-export MANPATH=\$(${OHPC_ADMIN}/lmod/lmod/libexec/addto MANPATH ${OHPC_ADMIN}/lmod/lmod/share/man)
+export MANPATH=\$(%{OHPC_ADMIN}/lmod/lmod/libexec/addto MANPATH %{OHPC_ADMIN}/lmod/lmod/share/man)
 
 # Set BASH_ENV for environment
 export BASH_ENV=%{OHPC_ADMIN}/lmod/lmod/init/bash
@@ -162,7 +162,7 @@ if ( ! $?MANPATH ) then
     setenv MANPATH ":"
 endif
 # Initialize MANPATH if unset, then safely append Lmod's man directory using addto helper
-setenv MANPATH `${OHPC_ADMIN}/lmod/lmod/libexec/addto MANPATH ${OHPC_ADMIN}/lmod/lmod/share/man`
+setenv MANPATH `%{OHPC_ADMIN}/lmod/lmod/libexec/addto MANPATH %{OHPC_ADMIN}/lmod/lmod/share/man`
 
 # Initialize modules system
 source %{OHPC_ADMIN}/lmod/lmod/init/csh >/dev/null

There was a mixup between shell variables and RPM variables.

[Amrithasuresh]

@adrianreber Thank you so much for the review and support!

I'm still a beginner in open-source contributions, but I would love to continue helping OpenHPC if possible. I have a few hours weekly. Please let me know if there are any small issues, tasks, or documentation areas where I could contribute.

[adrianreber]

@adrianreber Thank you so much for the review and support!

I'm still a beginner in open-source contributions, but I would love to continue helping OpenHPC if possible. I have a few hours weekly. Please let me know if there are any small issues, tasks, or documentation areas where I could contribute.

Reach out on the OpenHPC slack to me and we can discuss possible things to do.