Fixup r66984. It breakes bundler's examples.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5c11d85411
commit
bef0c0a367
@ -276,7 +276,7 @@ module Bundler
|
|||||||
# avoid stepping above the tmp directory when testing
|
# avoid stepping above the tmp directory when testing
|
||||||
gemspec = if ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]
|
gemspec = if ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]
|
||||||
# for Ruby Core
|
# for Ruby Core
|
||||||
"lib/bundler.gemspec"
|
"lib/bundler/bundler.gemspec"
|
||||||
else
|
else
|
||||||
"bundler.gemspec"
|
"bundler.gemspec"
|
||||||
end
|
end
|
||||||
|
@ -876,7 +876,7 @@ end
|
|||||||
|
|
||||||
FileUtils.ln_s(bundler_dir, File.join(gems_dir, "bundler-#{Bundler::VERSION}"))
|
FileUtils.ln_s(bundler_dir, File.join(gems_dir, "bundler-#{Bundler::VERSION}"))
|
||||||
|
|
||||||
gemspec_file = ruby_core? ? "#{bundler_dir}/lib/bundler.gemspec" : "#{bundler_dir}/bundler.gemspec"
|
gemspec_file = ruby_core? ? "#{bundler_dir}/lib/bundler/bundler.gemspec" : "#{bundler_dir}/bundler.gemspec"
|
||||||
gemspec = File.read(gemspec_file).
|
gemspec = File.read(gemspec_file).
|
||||||
sub("Bundler::VERSION", %("#{Bundler::VERSION}"))
|
sub("Bundler::VERSION", %("#{Bundler::VERSION}"))
|
||||||
gemspec = gemspec.lines.reject {|line| line =~ %r{lib/bundler/version} }.join
|
gemspec = gemspec.lines.reject {|line| line =~ %r{lib/bundler/version} }.join
|
||||||
|
Loading…
x
Reference in New Issue
Block a user