Fixed imports to make `git spconfig` work after recent merge from develop.

This commit is contained in:
citibeth 2016-03-26 20:21:27 -04:00
parent 9889b1a5fe
commit a1c965d70d

View file

@ -38,6 +38,7 @@
import textwrap import textwrap
import time import time
import glob import glob
import string
import llnl.util.tty as tty import llnl.util.tty as tty
import spack import spack
@ -51,6 +52,8 @@
import spack.repository import spack.repository
import spack.url import spack.url
import spack.util.web import spack.util.web
from urlparse import urlparse
from StringIO import StringIO from StringIO import StringIO
from llnl.util.filesystem import * from llnl.util.filesystem import *
from llnl.util.lang import * from llnl.util.lang import *
@ -59,9 +62,10 @@
from spack.stage import Stage, ResourceStage, StageComposite from spack.stage import Stage, ResourceStage, StageComposite
from spack.util.compression import allowed_archive from spack.util.compression import allowed_archive
from spack.util.environment import dump_environment 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 spack.version import *
from urlparse import urlparse from spack import directory_layout
"""Allowed URL schemes for spack packages.""" """Allowed URL schemes for spack packages."""
_ALLOWED_URL_SCHEMES = ["http", "https", "ftp", "file", "git"] _ALLOWED_URL_SCHEMES = ["http", "https", "ftp", "file", "git"]