diff options
| author | Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> | 2024-09-20 00:45:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-20 09:45:31 +0200 |
| commit | f9f6f094c34ddbe76e4e8455582041b239b5ff3c (patch) | |
| tree | 95a9f6c21c48063786815f663dcaa72f22219383 /lib | |
| parent | e780a83ac6a93704b310b7b3835814015702395a (diff) | |
| download | spack-f9f6f094c34ddbe76e4e8455582041b239b5ff3c.tar.gz spack-f9f6f094c34ddbe76e4e8455582041b239b5ff3c.tar.bz2 spack-f9f6f094c34ddbe76e4e8455582041b239b5ff3c.tar.xz spack-f9f6f094c34ddbe76e4e8455582041b239b5ff3c.zip | |
do_install: post #46423 cleanup (#46496)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/installer.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/rewiring.py | 3 | ||||
| -rw-r--r-- | lib/spack/spack/test/database.py | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/spack/spack/installer.py b/lib/spack/spack/installer.py index e73fa1dc1f..a02c6bc856 100644 --- a/lib/spack/spack/installer.py +++ b/lib/spack/spack/installer.py @@ -2221,7 +2221,7 @@ class BuildProcessInstaller: f"{self.pre} Building {self.pkg_id} [{self.pkg.build_system_class}]" # type: ignore[attr-defined] # noqa: E501 ) - # get verbosity from do_install() parameter or saved value + # get verbosity from install parameter or saved value self.echo = self.verbose if spack.package_base.PackageBase._verbose is not None: self.echo = spack.package_base.PackageBase._verbose diff --git a/lib/spack/spack/rewiring.py b/lib/spack/spack/rewiring.py index bffd085619..3b1a9ba451 100644 --- a/lib/spack/spack/rewiring.py +++ b/lib/spack/spack/rewiring.py @@ -39,7 +39,8 @@ def rewire(spliced_spec): for spec in spliced_spec.traverse(order="post", root=True): if not spec.build_spec.installed: # TODO: May want to change this at least for the root spec... - # spec.build_spec.package.do_install(force=True) + # TODO: Also remember to import PackageInstaller + # PackageInstaller([spec.build_spec.package]).install() raise PackageNotInstalledError(spliced_spec, spec.build_spec, spec) if spec.build_spec is not spec and not spec.installed: explicit = spec is spliced_spec diff --git a/lib/spack/spack/test/database.py b/lib/spack/spack/test/database.py index 6fd7575ffc..7140a50287 100644 --- a/lib/spack/spack/test/database.py +++ b/lib/spack/spack/test/database.py @@ -725,8 +725,8 @@ def test_external_entries_in_db(mutable_database): def test_regression_issue_8036(mutable_database, usr_folder_exists): # The test ensures that the external package prefix is treated as # existing. Even when the package prefix exists, the package should - # not be considered installed until it is added to the database with - # do_install. + # not be considered installed until it is added to the database by + # the installer with install(). s = spack.spec.Spec("externaltool@0.9") s.concretize() assert not s.installed |