diff options
| author | Peter Scheibel <scheibel1@llnl.gov> | 2015-11-11 18:04:22 -0800 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2015-11-11 18:04:22 -0800 |
| commit | 6d7b26d4e08c2ca29f2fe6ff32e63ebfd377d164 (patch) | |
| tree | 203f945e749562f3b28a7ff7facbfd8224fb55a0 /bin | |
| parent | 9474b8cdac433ccae4451c810fb7f4bb1bd1bd16 (diff) | |
| download | spack-6d7b26d4e08c2ca29f2fe6ff32e63ebfd377d164.tar.gz spack-6d7b26d4e08c2ca29f2fe6ff32e63ebfd377d164.tar.bz2 spack-6d7b26d4e08c2ca29f2fe6ff32e63ebfd377d164.tar.xz spack-6d7b26d4e08c2ca29f2fe6ff32e63ebfd377d164.zip | |
Insert lib/spack/external into sys.path. This avoids cases where the system
python install and lib/spack/external have the same library installed. This
requires modifying the names of some modules in lib/spack/external in cases
where both the system python and backported features of future python versions
(i.e. after 2.6) are used (previously distinguished by "from external import X"
and "import X").
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/spack | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -38,6 +38,8 @@ SPACK_PREFIX = os.path.dirname(os.path.dirname(SPACK_FILE)) # Allow spack libs to be imported in our scripts SPACK_LIB_PATH = os.path.join(SPACK_PREFIX, "lib", "spack") sys.path.insert(0, SPACK_LIB_PATH) +SPACK_EXTERNAL_LIBS = os.path.join(SPACK_LIB_PATH, "external") +sys.path.insert(0, SPACK_EXTERNAL_LIBS) # If there is no working directory, use the spack prefix. try: |