summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2016-08-30 10:47:38 -0500
committerAdam J. Stewart <ajstewart426@gmail.com>2016-08-30 15:36:33 -0500
commitae2a803496772db9ce6f9245d165b44f587e4389 (patch)
tree35ffd9658d260ca784006cefd5eb50e4dcafb99f /bin
parent8d1a753a1b21a4ac6ae94cbb97ba2cbf7da8367d (diff)
downloadspack-ae2a803496772db9ce6f9245d165b44f587e4389.tar.gz
spack-ae2a803496772db9ce6f9245d165b44f587e4389.tar.bz2
spack-ae2a803496772db9ce6f9245d165b44f587e4389.tar.xz
spack-ae2a803496772db9ce6f9245d165b44f587e4389.zip
Make subcommands importable, '-' -> '_', fixes #1642
Diffstat (limited to 'bin')
-rwxr-xr-xbin/spack11
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/spack b/bin/spack
index 7efa88f1ee..323a06aa53 100755
--- a/bin/spack
+++ b/bin/spack
@@ -56,8 +56,15 @@ with warnings.catch_warnings():
# Spack, were removed, but shadow system modules that Spack still
# imports. If we leave them, Spack will fail in mysterious ways.
# TODO: more elegant solution for orphaned pyc files.
-orphaned_pyc_files = [os.path.join(SPACK_EXTERNAL_LIBS, n)
- for n in ('functools.pyc', 'ordereddict.pyc')]
+orphaned_pyc_files = [
+ os.path.join(SPACK_EXTERNAL_LIBS, 'functools.pyc'),
+ os.path.join(SPACK_EXTERNAL_LIBS, 'ordereddict.pyc'),
+ os.path.join(SPACK_LIB_PATH, 'spack', 'platforms', 'cray_xc.pyc'),
+ os.path.join(SPACK_LIB_PATH, 'spack', 'cmd', 'package-list.pyc'),
+ os.path.join(SPACK_LIB_PATH, 'spack', 'cmd', 'test-install.pyc'),
+ os.path.join(SPACK_LIB_PATH, 'spack', 'cmd', 'url-parse.pyc')
+]
+
for pyc_file in orphaned_pyc_files:
if not os.path.exists(pyc_file):
continue