diff options
author | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 19:19:17 +0000 |
---|---|---|
committer | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 19:19:17 +0000 |
commit | af6593ba0d97a4cd110143d0d872b398f6f0a9e7 (patch) | |
tree | 9aa29fec15a6be1acf89fd362ef6b55dd658ad7a | |
parent | 44c8d6c4dbc75555ab2993ca1b39c42771313437 (diff) |
lib/pathname.rb: Backport #2110 [ruby-core:25627]; backport of r23093 to handle the scenario where, on filesystems like Windows', paths are compared using casecmp instead of ==.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@28234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/pathname.rb | 11 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 15 insertions, 4 deletions
@@ -1,6 +1,10 @@ +Wed Jun 9 02:10:00 Kirk Haines <khaines@ruby-lang.org> + + * lib/pathname.rb: Backport #2110 [ruby-core:25627]; backport of r23093 to handle the scenario where, on filesystems like Windows', paths are compared using casecmp instead of ==. + Wed Jun 9 01:42:00 Kirk Haines <khaines@ruby-lang.org> - * lib/date.rb: Backport #2707 [ruby-core:28011]; backport r27014 to fix problem with Date#>> and very small numbers. + * lib/date.rb: Backport #2707 [ruby-core:28011]; backport r27014 to fix problem with Date#>> and very small numbers. r28233 Wed Jun 9 01:05:00 Kirk Haines <khaines@ruby-lang.org> diff --git a/lib/pathname.rb b/lib/pathname.rb index e4ca5489ce..63588cf196 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -194,6 +194,13 @@ class Pathname # to_path is implemented so Pathname objects are usable with File.open, etc. TO_PATH = :to_path end + + SAME_PATHS = if File::FNM_SYSCASE + proc {|a, b| a.casecmp(b).zero?} + else + proc {|a, b| a == b} + end + # :startdoc: # @@ -705,12 +712,12 @@ class Pathname base_prefix, basename = r base_names.unshift basename if basename != '.' end - if dest_prefix != base_prefix + unless SAME_PATHS[dest_prefix, base_prefix] raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}" end while !dest_names.empty? && !base_names.empty? && - dest_names.first == base_names.first + SAME_PATHS[dest_names.first, base_names.first] dest_names.shift base_names.shift end @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-06-09" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20100609 -#define RUBY_PATCHLEVEL 409 +#define RUBY_PATCHLEVEL 410 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |