diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-27 13:00:45 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-27 13:00:45 +0000 |
| commit | d9c32d62a06edf6bcfaf357e44173cefd92778ee (patch) | |
| tree | ba0a22afc2b02ca4c6eba226ff27c120595968a7 /lib/rubygems/request_set.rb | |
| parent | b89e894399016def7979168d16eff9026012a710 (diff) | |
| download | ruby-d9c32d62a06edf6bcfaf357e44173cefd92778ee.tar.gz | |
* lib/rubygems: Update to RubyGems 2.4.6 and HEAD(800f2e6).
Fixed #1159, #1171, #1173 on rubygems/rubygems
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/request_set.rb')
| -rw-r--r-- | lib/rubygems/request_set.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb index 819a1d8e2d..cfbc955ed9 100644 --- a/lib/rubygems/request_set.rb +++ b/lib/rubygems/request_set.rb @@ -223,7 +223,7 @@ class Gem::RequestSet if options.fetch :lock, true then lockfile = - Gem::RequestSet::Lockfile.new self, gemdeps, gem_deps_api.dependencies + Gem::RequestSet::Lockfile.build self, gemdeps, gem_deps_api.dependencies lockfile.write end @@ -275,7 +275,7 @@ class Gem::RequestSet @git_set.root_dir = @install_dir - lock_file = "#{File.expand_path(path)}.lock" + lock_file = "#{File.expand_path(path)}.lock".untaint begin tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file lock_file parser = tokenizer.make_parser self, [] |