aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-05 03:29:20 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-05 03:29:20 +0000
commite5b75da1fe3a9a92ba018dd21fb3a462a7568b60 (patch)
treebf9f9d65e4f04bb81aaef25973ac5ec024199adb
parentc47c38de93db16ae2f24b7c6f45aa6700f62eb08 (diff)
downloadruby-e5b75da1fe3a9a92ba018dd21fb3a462a7568b60.tar.gz
* gem_prelude.rb (Gem.user_home): force_encoding(
Encoding.find('filesystem')). [ruby-core:26525] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--gem_prelude.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ecad14c838..2c6648a241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 5 12:27:07 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * gem_prelude.rb (Gem.user_home): force_encoding(
+ Encoding.find('filesystem')). [ruby-core:26525]
+
Thu Nov 5 07:47:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (BEGIN): now local_push are local_pop are necessary in
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 519f693bb4..15a1b43fe9 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -91,7 +91,7 @@ if defined?(Gem) then
end
def self.user_home
- @user_home ||= File.expand_path("~")
+ @user_home ||= File.expand_path("~").force_encoding(Encoding.find('filesystem'))
rescue
if File::ALT_SEPARATOR then
"C:/"