summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2018-01-16 07:00:39 +0100
committerGitHub <noreply@github.com>2018-01-16 07:00:39 +0100
commit1fb38c9e042f9fb349718616e9522a8d99f80128 (patch)
tree47638b3f23348894de7c126599d9cd17ed4f3861 /bin
parent498c522a31cff72fda0b46ea66234e623e698aa2 (diff)
downloadspack-1fb38c9e042f9fb349718616e9522a8d99f80128.tar.gz
spack-1fb38c9e042f9fb349718616e9522a8d99f80128.tar.bz2
spack-1fb38c9e042f9fb349718616e9522a8d99f80128.tar.xz
spack-1fb38c9e042f9fb349718616e9522a8d99f80128.zip
Vendor ordereddict for python2.6 only (#6931)
* Vendor ordereddict for python2.6 only This commit substitutes the custom module 'ordereddict_backport' with the more known 'ordereddict' and vendors it only for python 2.6. Other supported versions of python will use 'collections.OrderedDict'. * Use absolute imports also for python 2.6 See PEP-328 for more information on the subject * Added provenance of vendored ordereddict
Diffstat (limited to 'bin')
-rwxr-xr-xbin/spack4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/spack b/bin/spack
index 51dbce695b..e9278ddc4c 100755
--- a/bin/spack
+++ b/bin/spack
@@ -43,6 +43,10 @@ sys.path.insert(0, spack_lib_path)
# Add external libs
spack_external_libs = os.path.join(spack_lib_path, "external")
+
+if sys.version_info[:2] == (2, 6):
+ sys.path.insert(0, os.path.join(spack_external_libs, 'py26'))
+
sys.path.insert(0, spack_external_libs)
# Handle vendoring of YAML specially, as it has two versions.