summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2011-03-17 14:31:20 -0700
committerAndre Arko <andre@arko.net>2011-03-17 15:00:14 -0700
commitb3f3a64dc431cb2df5b40630b028ccf51d157d83 (patch)
tree600b71c4e30dd99e1002ea535d09ca90a76ead79
parent8dfa73496b4dc5c731602860983186e63eb9f12a (diff)
downloadbundler-b3f3a64dc431cb2df5b40630b028ccf51d157d83.tar.gz
force unsorted requirements order in lockfile for backwards RG compat
-rw-r--r--lib/bundler/dependency.rb3
-rw-r--r--lib/bundler/rubygems_ext.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index 06cb78c75f..6ff601e2b8 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -72,7 +72,8 @@ module Bundler
out = " #{name}"
unless requirement == Gem::Requirement.default
- out << " (#{requirement.to_s})"
+ reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }
+ out << " (#{reqs.join(', ')})"
end
out << '!' if source
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index f2c640c664..0fee4b9cdf 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -118,7 +118,8 @@ module Gem
def to_lock
out = " #{name}"
unless requirement == Gem::Requirement.default
- out << " (#{requirement.to_s})"
+ reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }
+ out << " (#{reqs.join(', ')})"
end
out
end