From 16530f84be04b8466769b9b74fe920d67006b988 Mon Sep 17 00:00:00 2001
From: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
Date: Wed, 12 Jun 2019 17:07:47 -0700
Subject: Update remaining packages to use Stage.source_path (#11662)

#11528 updated Stage to always store a Package's source in a fixed
directory accessible via `Stage.source_path` This left behind a
number of packages which were expecting to access the source code
via `Stage.path`. This Updates those packages to use
`Stage.source_path` instead.

This also updates the name of the fixed directory: The original name
of the fixed directory was "src", so if an expanded archive created a
"src" directory, then users inspecting the directory structure could
see paths like "src/src" (which wasn't wrong but could be confusing).
Therefore this also updates the name of the fixed directory to
"spack-src".
---
 lib/spack/spack/stage.py      | 2 +-
 lib/spack/spack/test/stage.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py
index 9ecc148ad8..34d19860fa 100644
--- a/lib/spack/spack/stage.py
+++ b/lib/spack/spack/stage.py
@@ -28,7 +28,7 @@ import spack.util.pattern as pattern
 from spack.util.path import canonicalize_path
 from spack.util.crypto import prefix_bits, bit_length
 
-_source_path_subdir = 'src'
+_source_path_subdir = 'spack-src'
 _stage_prefix = 'spack-stage-'
 
 
diff --git a/lib/spack/spack/test/stage.py b/lib/spack/spack/test/stage.py
index 2862abc1d3..ba0249f6eb 100644
--- a/lib/spack/spack/test/stage.py
+++ b/lib/spack/spack/test/stage.py
@@ -48,7 +48,7 @@ _include_extra = 3
 # to have the following structure:
 #
 # TMPDIR/                 temp stage dir
-#     src/                well-known stage source directory
+#     spack-src/          well-known stage source directory
 #         _readme_fn      Optional test_readme (contains _readme_contents)
 #     _hidden_fn          Optional hidden file (contains _hidden_contents)
 #     _archive_fn         archive_url = file:///path/to/_archive_fn
@@ -56,7 +56,7 @@ _include_extra = 3
 # while exploding tarball directories are expected to be structured as follows:
 #
 # TMPDIR/                 temp stage dir
-#     src/                well-known stage source directory
+#     spack-src/          well-known stage source directory
 #         archive_name/   archive dir
 #             _readme_fn  test_readme (contains _readme_contents)
 #         _extra_fn       test_extra file (contains _extra_contents)
-- 
cgit v1.2.3-70-g09d2