mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-21 13:50:20 +08:00
Revert "Avoid duplicate dependency installation"
This reverts commit c0cf41a15c.
This commit is contained in:
@@ -159,9 +159,6 @@ class DependencyManager(object):
|
||||
|
||||
# Shortcut - resolution complete for this resolver.
|
||||
resolver_requirements.append(requirement_to_dependency)
|
||||
# We have a complete set of dependencies, don't install
|
||||
# via lower-ranked resolvers
|
||||
kwds['install'] = False
|
||||
continue
|
||||
|
||||
# Check individual requirements
|
||||
@@ -181,11 +178,6 @@ class DependencyManager(object):
|
||||
requirement_to_dependency[requirement] = dependency
|
||||
if requirement_to_dependency:
|
||||
resolver_requirements.append(requirement_to_dependency)
|
||||
if (len(requirement_to_dependency) == len(resolvable_requirements) and
|
||||
all(True for d in requirement_to_dependency if not isinstance(d, NullDependency))):
|
||||
# We resolved all individual requirements, no need to further install dependencies
|
||||
# resolved by subsequent resolvers.
|
||||
kwds['install'] = False
|
||||
if not resolver_requirements:
|
||||
# Have at least a single empty dict
|
||||
resolver_requirements.append(OrderedDict())
|
||||
|
||||
Reference in New Issue
Block a user