Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adopt module_load_environment in generic Rpm easyblock #3561

Merged
merged 9 commits into from
Jan 20, 2025
18 changes: 5 additions & 13 deletions easybuild/easyblocks/generic/rpm.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ def __init__(self, *args, **kwargs):

self.rebuild_rpm = False

# Add common PATH/LD_LIBRARY_PATH paths found in RPMs to module load environment
self.module_load_environment.PATH = [os.path.join('usr', 'bin'), 'sbin', os.path.join('usr', 'sbin')]
self.module_load_environment.LD_LIBRARY_PATH = [os.path.join('usr', 'lib'), os.path.join('usr', 'lib64')]
self.module_load_environment.MANPATH = [os.path.join('usr', 'share', 'man')]

@staticmethod
def extra_options(extra_vars=None):
"""Extra easyconfig parameters specific to RPMs."""
Expand Down Expand Up @@ -232,16 +237,3 @@ def install_step(self):
symlink(realdirs[0], os.path.join(self.installdir, os.path.basename(path)))
else:
self.log.debug("No match found for symlink glob %s." % path)

def make_module_req_guess(self):
"""Add common PATH/LD_LIBRARY_PATH paths found in RPMs to list of guesses."""

guesses = super(Rpm, self).make_module_req_guess()

guesses.update({
'PATH': guesses.get('PATH', []) + ['usr/bin', 'sbin', 'usr/sbin'],
'LD_LIBRARY_PATH': guesses.get('LD_LIBRARY_PATH', []) + ['usr/lib', 'usr/lib64'],
'MANPATH': guesses.get('MANPATH', []) + ['usr/share/man'],
})

return guesses
Loading