Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase

Conflicts:
	lib/spack/spack/cmd/install.py
	lib/spack/spack/cmd/setup.py

1 files changed, 11 insertions, 1 deletions

diff --git a/bin/spack b/bin/spack
index dcc25c5c83..29991c070d 100755
--- a/bin/spack
+++ b/bin/spack
@@ -40,6 +40,16 @@ 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)
+
+# Try to use system YAML if it is available, as it might have libyaml
+# support (for faster loading via C).  Load it before anything in
+# lib/spack/external so it will take precedence over Spack's PyYAML.
+try:
+    import yaml
+except ImportError:
+    pass   # ignore and use slow yaml
+
+# Add external libs
 SPACK_EXTERNAL_LIBS = os.path.join(SPACK_LIB_PATH, "external")
 sys.path.insert(0, SPACK_EXTERNAL_LIBS)
 
@@ -161,7 +171,7 @@ def main():
     # If the user asked for it, don't check ssl certs.
     if args.insecure:
         tty.warn("You asked for --insecure. Will NOT check SSL certificates.")
-        spack.curl.add_default_arg('-k')
+        spack.insecure = True
 
     # Try to load the particular command asked for and run it
     command = spack.cmd.get_command(args.command.replace('-', '_'))