1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert previous commit because it was a mistake.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-04-22 09:10:34 +00:00
parent 54c011a92f
commit 6968f3a0fd
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,9 +1,3 @@
Fri Apr 22 17:49:34 2016 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path.
https://github.com/rubygems/rubygems/pull/1554
[Bug #12193][ruby-core:74431]
Fri Apr 1 00:41:17 2016 NAKAMURA Usaku <usa@ruby-lang.org> Fri Apr 1 00:41:17 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* test/rubygems/test_gem_commands_environment_command.rb (test_execute): * test/rubygems/test_gem_commands_environment_command.rb (test_execute):

11
lib/rubygems/test_case.rb
View File

@ -247,17 +247,6 @@ class Gem::TestCase < MiniTest::Unit::TestCase
@tempdir.untaint @tempdir.untaint
end end
# This makes the tempdir consistent on Windows.
# Dir.tmpdir may return short path name, but Dir[Dir.tmpdir] returns long
# path name. https://bugs.ruby-lang.org/issues/10819
# File.expand_path or File.realpath doesn't convert path name to long path
# name. Only Dir[] (= Dir.glob) works.
# Short and long path name is specific to Windows filesystem.
if win_platform?
@tempdir = Dir[@tempdir][0]
@tempdir.untaint
end
@gemhome = File.join @tempdir, 'gemhome' @gemhome = File.join @tempdir, 'gemhome'
@userhome = File.join @tempdir, 'userhome' @userhome = File.join @tempdir, 'userhome'
ENV["GEM_SPEC_CACHE"] = File.join @tempdir, 'spec_cache' ENV["GEM_SPEC_CACHE"] = File.join @tempdir, 'spec_cache'

6
version.h
View File

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.10" #define RUBY_VERSION "2.1.10"
#define RUBY_RELEASE_DATE "2016-04-22" #define RUBY_RELEASE_DATE "2016-04-01"
#define RUBY_PATCHLEVEL 493 #define RUBY_PATCHLEVEL 492
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 22 #define RUBY_RELEASE_DAY 1
#include "ruby/version.h" #include "ruby/version.h"