summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-08-03 13:15:15 -0700
committerCarl Lerche <carllerche@mac.com>2010-08-03 14:53:25 -0700
commit2de5e9e44e3ad0d0b21d7b23e2093ee6e53fdabc (patch)
tree73bb866495d1d414470d02e2a164355a00e38e31
parentbee3349330827f34cb131f4bdf9715090cd44456 (diff)
downloadbundler-2de5e9e44e3ad0d0b21d7b23e2093ee6e53fdabc.tar.gz
Remove an unneeded branch of code
-rw-r--r--lib/bundler/definition.rb18
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index d7c9beab81..b01c438f25 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -131,18 +131,14 @@ module Bundler
def resolve
@resolve ||= begin
converge_locked_specs
- if !new_platform? && @last_resolve.valid_for?(expanded_dependencies)
- @last_resolve
- else
- source_requirements = {}
- dependencies.each do |dep|
- next unless dep.source
- source_requirements[dep.name] = dep.source.specs
- end
-
- # Run a resolve against the locally available gems
- @last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, @last_resolve)
+ source_requirements = {}
+ dependencies.each do |dep|
+ next unless dep.source
+ source_requirements[dep.name] = dep.source.specs
end
+
+ # Run a resolve against the locally available gems
+ @last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, @last_resolve)
end
end