treat metadata_dir as an instance variable but dont set it from kwargs; this follows several other hardcoded variables which must be consistent between upstream and downstream DBs. Also update DirectoryLayout.metadata_path to work entirely with Spec.prefix, since Spec.prefix is set from the DB when available (so metadata_path was duplicating that logic)

scheibelp · scheibelp · commit 2e39fdfc780f · 2019-03-15T17:45:33.000-07:00
diff --git a/lib/spack/spack/directory_layout.py b/lib/spack/spack/directory_layout.py
@@ -171,8 +171,6 @@ class YamlDirectoryLayout(DirectoryLayout):
        arguments hash_len and path_scheme.
     """
 
-    metadata_dir = '.spack'
-
     def __init__(self, root, **kwargs):
         super(YamlDirectoryLayout, self).__init__(root)
         self.hash_len       = kwargs.get('hash_len')
@@ -187,6 +185,9 @@ def __init__(self, root, **kwargs):
             self.path_scheme = self.path_scheme.replace(
                 "${HASH}", "${HASH:%d}" % self.hash_len)
 
+        # If any of these paths change, downstream databases may not be able to
+        # locate files in older upstream databases
+        self.metadata_dir        = '.spack'
         self.spec_file_name      = 'spec.yaml'
         self.extension_file_name = 'extensions.yaml'
         self.build_log_name      = 'build.out'  # build log.
@@ -195,7 +196,7 @@ def __init__(self, root, **kwargs):
 
     @property
     def hidden_file_paths(self):
-        return (YamlDirectoryLayout.metadata_dir,)
+        return (self.metadata_dir,)
 
     def relative_path_for_spec(self, spec):
         _check_concrete(spec)
@@ -236,11 +237,7 @@ def disable_upstream_check(self):
         self.check_upstream = True
 
     def metadata_path(self, spec):
-        if self.check_upstream and spec.package.installed_upstream:
-            return os.path.join(spec.prefix, YamlDirectoryLayout.metadata_dir)
-        else:
-            return os.path.join(
-                self.path_for_spec(spec), YamlDirectoryLayout.metadata_dir)
+        return os.path.join(spec.prefix, self.metadata_dir)
 
     def build_log_path(self, spec):
         return os.path.join(self.metadata_path(spec), self.build_log_name)
@@ -308,7 +305,7 @@ def all_specs(self):
             return []
 
         path_elems = ["*"] * len(self.path_scheme.split(os.sep))
-        path_elems += [YamlDirectoryLayout.metadata_dir, self.spec_file_name]
+        path_elems += [self.metadata_dir, self.spec_file_name]
         pattern = os.path.join(self.root, *path_elems)
         spec_files = glob.glob(pattern)
         return [self.read_spec(s) for s in spec_files]
@@ -374,11 +371,11 @@ def extension_file_path(self, spec):
             # For backwards compatibility, when the view is the extended
             # package's installation directory, do not include the spec name
             # as a subdirectory.
-            components = [view_prefix, YamlDirectoryLayout.metadata_dir,
+            components = [view_prefix, self.metadata_dir,
                           self.extension_file_name]
         else:
-            components = [view_prefix, YamlDirectoryLayout.metadata_dir,
-                          spec.name, self.extension_file_name]
+            components = [view_prefix, self.metadata_dir, spec.name,
+                          self.extension_file_name]
 
         return os.path.join(*components)
 
diff --git a/lib/spack/spack/test/directory_layout.py b/lib/spack/spack/test/directory_layout.py
@@ -22,7 +22,11 @@
 @pytest.fixture()
 def layout_and_dir(tmpdir):
     """Returns a directory layout and the corresponding directory."""
-    yield YamlDirectoryLayout(str(tmpdir)), str(tmpdir)
+    layout = YamlDirectoryLayout(str(tmpdir))
+    old_layout = spack.store.layout
+    spack.store.layout = layout
+    yield layout, str(tmpdir)
+    spack.store.layout = old_layout
 
 
 def test_yaml_directory_layout_parameters(
