Remove artifacts of frequent rebase
fixup
This commit is contained in:
parent
b3cc4b4cb3
commit
dc12cfde75
@ -86,7 +86,6 @@
|
||||
parse_term,
|
||||
)
|
||||
from .input_analysis import create_counter, create_graph_analyzer
|
||||
from .libc import CompilerPropertyDetector
|
||||
from .requirements import RequirementKind, RequirementParser, RequirementRule
|
||||
from .version_order import concretization_version_order
|
||||
|
||||
@ -2234,14 +2233,6 @@ def external_packages(self):
|
||||
if pkg_name == "all":
|
||||
continue
|
||||
|
||||
# package isn't a possible dependency and can't be in the solution
|
||||
if pkg_name not in self.pkgs:
|
||||
continue
|
||||
|
||||
# This package is not in the possible dependencies
|
||||
if pkg_name not in self.pkgs:
|
||||
continue
|
||||
|
||||
# This package is not among possible dependencies
|
||||
if pkg_name not in self.pkgs:
|
||||
continue
|
||||
@ -4469,9 +4460,8 @@ def _check_input_and_extract_concrete_specs(specs):
|
||||
for s in root.traverse():
|
||||
candidates = s.edges_to_dependencies(depflag=dt.BUILD)
|
||||
if candidates:
|
||||
virtuals = set()
|
||||
non_virtuals = spack.package_base.possible_dependencies(
|
||||
s, transitive=False, virtuals=virtuals
|
||||
non_virtuals, virtuals, _ = create_graph_analyzer().possible_dependencies(
|
||||
s, transitive=False, allowed_deps=dt.LINK | dt.RUN | dt.BUILD
|
||||
)
|
||||
possible_direct_deps = set(non_virtuals) | virtuals
|
||||
not_possible = set(
|
||||
@ -4496,7 +4486,7 @@ def _check_input_and_extract_concrete_specs(specs):
|
||||
continue
|
||||
|
||||
try:
|
||||
s.package_class
|
||||
spack.repo.PATH.get_pkg_class(s.fullname)
|
||||
except spack.repo.UnknownPackageError:
|
||||
raise UnsatisfiableSpecError(
|
||||
f"cannot concretize '{root}', since '{s.name}' does not exist"
|
||||
|
Loading…
Reference in New Issue
Block a user