summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/source/path.rb2
-rw-r--r--lib/bundler/source/rubygems.rb1
-rw-r--r--lib/bundler/source_list.rb3
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/bundler/source/path.rb b/lib/bundler/source/path.rb
index c80ac61f46..398ed6025a 100644
--- a/lib/bundler/source/path.rb
+++ b/lib/bundler/source/path.rb
@@ -103,7 +103,7 @@ module Bundler
name
end
- private
+ private
def expand(somepath)
somepath.expand_path(Bundler.root)
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 635bb993ad..f3b8b7c83b 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -344,6 +344,7 @@ module Bundler
def remotes_equal?(other_remotes)
remotes.map(&method(:suppress_configured_credentials)) == other_remotes.map(&method(:suppress_configured_credentials))
end
+
end
end
end
diff --git a/lib/bundler/source_list.rb b/lib/bundler/source_list.rb
index 4f537c4a2b..0d9fb516c8 100644
--- a/lib/bundler/source_list.rb
+++ b/lib/bundler/source_list.rb
@@ -37,7 +37,8 @@ module Bundler
end
def lock_sources
- (path_sources + git_sources) << combine_rubygems_sources
+ lock_sources = (path_sources + git_sources).sort_by(&:to_s)
+ lock_sources << combine_rubygems_sources
end
def replace_sources!(replacement_sources)