style
This commit is contained in:
parent
a1d37bbd7a
commit
655ee3387b
@ -4188,17 +4188,18 @@ def splice(self, other, transitive):
|
|||||||
if v in self or v in self.package.virtuals_provided
|
if v in self or v in self.package.virtuals_provided
|
||||||
]
|
]
|
||||||
if transitive:
|
if transitive:
|
||||||
virtuals_to_replace.extend([
|
virtuals_to_replace.extend(
|
||||||
v.name
|
[
|
||||||
for od in other.traverse(root=False)
|
v.name
|
||||||
for v in od.package.virtuals_provided
|
for od in other.traverse(root=False)
|
||||||
if v in self or v in self.package.virtuals_provided
|
for v in od.package.virtuals_provided
|
||||||
])
|
if v in self or v in self.package.virtuals_provided
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
if virtuals_to_replace:
|
if virtuals_to_replace:
|
||||||
deps_to_replace = {
|
deps_to_replace = {
|
||||||
self[v]: (other[v] if v in other else other)
|
self[v]: (other[v] if v in other else other) for v in virtuals_to_replace
|
||||||
for v in virtuals_to_replace
|
|
||||||
}
|
}
|
||||||
# deps_to_replace = [self[v] for v in virtuals_to_replace]
|
# deps_to_replace = [self[v] for v in virtuals_to_replace]
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user