diff options
| author | Andre Arko <andre@arko.net> | 2011-04-28 15:43:53 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2011-04-28 15:43:53 -0700 |
| commit | e48440a6c15d48595485c3d1342d4fa433792ae9 (patch) | |
| tree | 17a498945b936620b41ae6df08aea6cb8c2e6440 /lib/bundler/definition.rb | |
| parent | 850b161afa3db92983a6ac6ed086f73d5b97b2fb (diff) | |
| parent | 7c6a566e1362a51435b8f6ac7efe59f0c3dc3022 (diff) | |
| download | bundler-e48440a6c15d48595485c3d1342d4fa433792ae9.tar.gz | |
Merge branch '1-0-stable'
Conflicts:
lib/bundler/cli.rb
lib/bundler/source.rb
Diffstat (limited to 'lib/bundler/definition.rb')
| -rw-r--r-- | lib/bundler/definition.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index dc397f9ed6..0853abe6da 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -61,7 +61,7 @@ module Bundler @unlock[:gems] ||= [] @unlock[:sources] ||= [] - current_platform = Gem.platforms.map { |p| generic(p) }.compact.last + current_platform = Bundler.rubygems.platforms.map { |p| generic(p) }.compact.last @new_platform = !@platforms.include?(current_platform) @platforms |= [current_platform] |