From 6790c040df493afe4e6ca485e73447e3efa857ce Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 28 Oct 2009 06:06:17 +0000 Subject: [PATCH] * gem_prelude.rb (Gem.set_home): force_encoding(Encoding.filesystem_encoding) [ruby-dev:39546] * gem_prelude.rb (Gem.set_paths): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25527 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ gem_prelude.rb | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4ef00b469c..da28a55e3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Oct 28 15:02:31 2009 NARUSE, Yui + + * gem_prelude.rb (Gem.set_home): + force_encoding(Encoding.filesystem_encoding) + [ruby-dev:39546] + + * gem_prelude.rb (Gem.set_paths): ditto. + Wed Oct 28 14:24:45 2009 NARUSE, Yui * encoding.c (get_filesystem_encoding): diff --git a/gem_prelude.rb b/gem_prelude.rb index ca865aabdc..c60c10b911 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -67,7 +67,7 @@ if defined?(Gem) then def self.set_home(home) home = home.gsub File::ALT_SEPARATOR, File::SEPARATOR if File::ALT_SEPARATOR - @gem_home = home + @gem_home = home.force_encoding(Encoding.filesystem_encoding) end def self.set_paths(gpaths) @@ -87,6 +87,7 @@ if defined?(Gem) then end @gem_path.uniq! + @gem_path.map!{|x|x.force_encoding(Encoding.filesystem_encoding)} end def self.user_home