lib/bundler/definition.rb in bundler-1.0.0.beta.4 vs lib/bundler/definition.rb in bundler-1.0.0.beta.5

@@ -1,10 +1,10 @@
 require "digest/sha1"
 
 module Bundler
   class Definition
-    attr_reader :dependencies, :platforms
+    attr_reader :dependencies, :platforms, :sources
 
     def self.build(gemfile, lockfile, unlock)
       unlock ||= {}
       gemfile = Pathname.new(gemfile).expand_path
 
@@ -230,10 +230,10 @@
         dep == d && dep.source == d.source
       end
     end
 
     def satisfies_locked_spec?(dep)
-      @last_resolve.any? { |s| s.satisfies?(dep) }
+      @last_resolve.any? { |s| s.satisfies?(dep) && (!dep.source || s.source == dep.source) }
     end
 
     def expanded_dependencies
       @expanded_dependencies ||= expand_dependencies(dependencies, @remote)
     end