zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #230 from nolta/fix-env-mod-sys-type

Browse Source 
fix environment module path when $SYS_TYPE isn't defined
This commit is contained in:
Todd Gamblin 2015-12-19 20:59:13 -08:00
commit 9edba18489
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/spack/spack/cmd/python.py
View File

@ -31,6 +31,8 @@
import spack import spack
def setup_parser(subparser): def setup_parser(subparser):
subparser.add_argument(
'-c', dest='python_command', help='Command to execute.')
subparser.add_argument( subparser.add_argument(
'python_args', nargs=argparse.REMAINDER, help="File to run plus arguments.") 'python_args', nargs=argparse.REMAINDER, help="File to run plus arguments.")
@ -38,7 +40,8 @@ def setup_parser(subparser):
def python(parser, args): def python(parser, args):
# Fake a main python shell by setting __name__ to __main__. # Fake a main python shell by setting __name__ to __main__.
console = code.InteractiveConsole({'__name__' : '__main__'}) console = code.InteractiveConsole({'__name__' : '__main__',
'spack' : spack})
if "PYTHONSTARTUP" in os.environ: if "PYTHONSTARTUP" in os.environ:
startup_file = os.environ["PYTHONSTARTUP"] startup_file = os.environ["PYTHONSTARTUP"]
@ -47,7 +50,10 @@ def python(parser, args):
console.runsource(startup.read(), startup_file, 'exec') console.runsource(startup.read(), startup_file, 'exec')
python_args = args.python_args python_args = args.python_args
if python_args: python_command = args.python_command
if python_command:
console.runsource(python_command)
elif python_args:
sys.argv = python_args sys.argv = python_args
with open(python_args[0]) as file: with open(python_args[0]) as file:
console.runsource(file.read(), python_args[0], 'exec') console.runsource(file.read(), python_args[0], 'exec')

8
share/spack/setup-env.sh
View File

@ -173,8 +173,8 @@ fi
# #
_sp_share_dir=$(cd "$(dirname $_sp_source_file)" && pwd) _sp_share_dir=$(cd "$(dirname $_sp_source_file)" && pwd)
_sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd) _sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd)
# TODO: fix SYS_TYPE to something non-LLNL-specific
_spack_pathadd DK_NODE "${_sp_share_dir%/}/dotkit/$SYS_TYPE"
_spack_pathadd MODULEPATH "${_sp_share_dir%/}/modules/$SYS_TYPE"
_spack_pathadd PATH "${_sp_prefix%/}/bin" _spack_pathadd PATH "${_sp_prefix%/}/bin"
_sp_sys_type=$(spack-python -c 'print(spack.architecture.sys_type())')
_spack_pathadd DK_NODE "${_sp_share_dir%/}/dotkit/$_sp_sys_type"
_spack_pathadd MODULEPATH "${_sp_share_dir%/}/modules/$_sp_sys_type"