zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

environment.py: write lockfile last (#30039)

Browse Source 
This makes it easier to write `spack.lock: spack.yaml` type of rules in `Makefiles`.
This commit is contained in:
Harmen Stoppels 2022-04-19 21:32:59 +02:00 committed by GitHub
parent dc3cf5c6b0
commit abc162cf3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/environment/environment.py
View File

@ -1897,10 +1897,14 @@ def write(self, regenerate=True):
fs.mkdirp(pkg_dir) fs.mkdirp(pkg_dir)
spack.repo.path.dump_provenance(dep, pkg_dir) spack.repo.path.dump_provenance(dep, pkg_dir)
# write the lock file last self._update_and_write_manifest(raw_yaml_dict, yaml_dict)
# Write the lock file last. This is useful for Makefiles
# with `spack.lock: spack.yaml` rules, where the target
# should be newer than the prerequisite to avoid
# redundant re-concretization.
with fs.write_tmp_and_move(self.lock_path) as f: with fs.write_tmp_and_move(self.lock_path) as f:
sjson.dump(self._to_lockfile_dict(), stream=f) sjson.dump(self._to_lockfile_dict(), stream=f)
self._update_and_write_manifest(raw_yaml_dict, yaml_dict)
else: else:
with fs.safe_remove(self.lock_path): with fs.safe_remove(self.lock_path):
self._update_and_write_manifest(raw_yaml_dict, yaml_dict) self._update_and_write_manifest(raw_yaml_dict, yaml_dict)