aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/source_list.rb
diff options
context:
space:
mode:
authorTim Moore <tmoore@incrementalism.net>2014-11-16 23:36:45 +1100
committerTim Moore <tmoore@incrementalism.net>2014-12-11 16:56:03 +1100
commit5351e8f3993e27d2994b4a50ae429766c0a2df51 (patch)
tree3e226090dc5d073c8083131b8e1844acdac99fd9 /lib/bundler/source_list.rb
parenta5ad4e650d977d8881f95cf026ce7b8fe6ff2238 (diff)
downloadbundler-5351e8f3993e27d2994b4a50ae429766c0a2df51.tar.gz
Convert sources to lock format before comparing.
If the Gemfile sources lock to the same result as the current locked sources, they haven't changed. Closes #3298.
Diffstat (limited to 'lib/bundler/source_list.rb')
-rw-r--r--lib/bundler/source_list.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/source_list.rb b/lib/bundler/source_list.rb
index 05e2251f..49a976ba 100644
--- a/lib/bundler/source_list.rb
+++ b/lib/bundler/source_list.rb
@@ -59,10 +59,10 @@ module Bundler
replacement_rubygems =
replacement_sources.detect { |s| s.is_a?(Source::Rubygems) }
- @rubygems_aggregate = replacement_rubygems
+ @rubygems_aggregate = replacement_rubygems if replacement_rubygems
# Return true if there were changes
- all_sources.to_set != replacement_sources.to_set ||
+ lock_sources.to_set != replacement_sources.to_set ||
rubygems_remotes.to_set != replacement_rubygems.remotes.to_set
end