summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColby Swandale <me@colby.fyi>2018-12-26 22:03:34 +1100
committerColby Swandale <me@colby.fyi>2018-12-26 22:03:34 +1100
commitc85bb051134af93b2cdd6640e6c9f2d5262268e4 (patch)
treed23f09a8ed4295eda40a0267f8ecc8257c998cd7
parenta845a0d56c5f68999b0dfd87c95d5c456dacdc57 (diff)
downloadbundler-colby/revert-b490e73.tar.gz
remove code that was previously unreachablecolby/revert-b490e73
Some code that used to be unreachable was changed in https://github.com/bundler/bundler/issues/6829. This is causing some issues on some versions of Ruby, see https://github.com/bundler/bundler/pull/6849.
-rw-r--r--lib/bundler/source/metadata.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/bundler/source/metadata.rb b/lib/bundler/source/metadata.rb
index 47a751debb..559b912ffd 100644
--- a/lib/bundler/source/metadata.rb
+++ b/lib/bundler/source/metadata.rb
@@ -21,9 +21,8 @@ module Bundler
# can't point to the actual gemspec or else the require paths will be wrong
s.loaded_from = File.expand_path("..", __FILE__)
end
- if loaded_spec = Bundler.rubygems.loaded_specs("bundler")
- idx << loaded_spec # this has to come after the fake gemspec, to override it
- elsif local_spec = Bundler.rubygems.find_name("bundler").find {|s| s.version.to_s == VERSION }
+
+ if local_spec = Bundler.rubygems.find_name("bundler").find {|s| s.version.to_s == VERSION }
idx << local_spec
end