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

installer.py: handle external roots the same (#44917)

Browse Source 
There was logic not to enqueue build requests for externals if they occur as
roots. That's unnecessary.
This commit is contained in:
Harmen Stoppels 2024-06-28 11:26:56 +02:00 committed by GitHub
parent fa96422702
commit 0b3b49b4e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/spack/spack/installer.py
View File

@ -1542,17 +1542,6 @@ def _add_tasks(self, request: BuildRequest, all_deps):
tty.warn(f"Installation request refused: {str(err)}") tty.warn(f"Installation request refused: {str(err)}")
return return
# Skip out early if the spec is not being installed locally (i.e., if
# external or upstream).
#
# External and upstream packages need to get flagged as installed to
# ensure proper status tracking for environment build.
explicit = request.pkg.spec.dag_hash() in request.install_args.get("explicit", [])
not_local = _handle_external_and_upstream(request.pkg, explicit)
if not_local:
self._flag_installed(request.pkg)
return
install_compilers = spack.config.get("config:install_missing_compilers", False) install_compilers = spack.config.get("config:install_missing_compilers", False)
install_deps = request.install_args.get("install_deps") install_deps = request.install_args.get("install_deps")
@ -2029,8 +2018,7 @@ def install(self) -> None:
# Skip the installation if the spec is not being installed locally # Skip the installation if the spec is not being installed locally
# (i.e., if external or upstream) BUT flag it as installed since # (i.e., if external or upstream) BUT flag it as installed since
# some package likely depends on it. # some package likely depends on it.
if not task.explicit: if _handle_external_and_upstream(pkg, task.explicit):
if _handle_external_and_upstream(pkg, False):
term_status.clear() term_status.clear()
self._flag_installed(pkg, task.dependents) self._flag_installed(pkg, task.dependents)
continue continue