Merge branch 'develop' into features/mpich

* develop: (43 commits)
  Make libxcb compile with gcc 4.9.
  disable parallel install for glib (found races)
  disable cairo-trace, which is incompatible with older libiberty.h.
  Fix LaunchMon on newer gcc versions.
  Simplify output redirection in spack.util.executable
  Allow completely empty config files.
  Fix create, diy, edit, and repo commands to use multiple repos.
  Add namespace option to find command.
  Temporary fix: Clang is the default compiler on Mac OS X.
  update compiler config test.
  add sanity check on config write as well as validation on read.
  Add jsonschema validation for config files.
  Make text wrapping off by default in tty, add a kwarg for it.
  add/remove/list working for new config format.
  Add Python 3 aliases to our argparse backport.
  All tests that call concretize() need to be MockPackagesTests.
  Fix bug in tests.
  Rework mirror configuration.
  Rework compiler configuration and simplify config.py logic.
  Remove mock_configs; tests no longer modify spack home directory.
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/bin/spack b/bin/spack
index 55b2708875..93263217ac 100755
--- a/bin/spack
+++ b/bin/spack
@@ -140,8 +140,8 @@ def main():
 
     spack.spack_working_dir = working_dir
     if args.mock:
-        from spack.packages import PackageDB
-        spack.db = PackageDB(spack.mock_packages_path)
+        from spack.repository import RepoPath
+        spack.repo.swap(RepoPath(spack.mock_packages_path))
 
     # If the user asked for it, don't check ssl certs.
     if args.insecure: