summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorcitibeth <rpf2116@columbia.edu>2016-03-26 20:21:27 -0400
committercitibeth <rpf2116@columbia.edu>2016-03-26 20:40:22 -0400
commita1c965d70d7074dcedd88379c636f834f6c88fd2 (patch)
tree870ffdc8cec6306a1d26a30f448919fcd07a159f /lib
parent9889b1a5febc2aedec6401ae701b55961cf0d559 (diff)
downloadspack-a1c965d70d7074dcedd88379c636f834f6c88fd2.tar.gz
spack-a1c965d70d7074dcedd88379c636f834f6c88fd2.tar.bz2
spack-a1c965d70d7074dcedd88379c636f834f6c88fd2.tar.xz
spack-a1c965d70d7074dcedd88379c636f834f6c88fd2.zip
Fixed imports to make ``git spconfig`` work after recent merge from develop.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/package.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 2d7cb765a0..51ee3d7d8b 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -38,6 +38,7 @@ import re
import textwrap
import time
import glob
+import string
import llnl.util.tty as tty
import spack
@@ -51,6 +52,8 @@ import spack.mirror
import spack.repository
import spack.url
import spack.util.web
+
+from urlparse import urlparse
from StringIO import StringIO
from llnl.util.filesystem import *
from llnl.util.lang import *
@@ -59,9 +62,10 @@ from llnl.util.tty.log import log_output
from spack.stage import Stage, ResourceStage, StageComposite
from spack.util.compression import allowed_archive
from spack.util.environment import dump_environment
-from spack.util.executable import ProcessError
+from spack.util.executable import ProcessError, Executable, which
from spack.version import *
-from urlparse import urlparse
+from spack import directory_layout
+
"""Allowed URL schemes for spack packages."""
_ALLOWED_URL_SCHEMES = ["http", "https", "ftp", "file", "git"]