diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/pathname.rb | 4 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Mon Jan 26 15:49:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/pathname.rb (chop_basename, prepend_prefix): use o option. + Sun Jan 25 16:35:44 2009 Tanaka Akira <akr@fsij.org> * ext/socket/socket.c (socket_s_ip_address_list): renamed from diff --git a/lib/pathname.rb b/lib/pathname.rb index 86f0f5480..2b25ca957 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -274,7 +274,7 @@ class Pathname # chop_basename(path) -> [pre-basename, basename] or nil def chop_basename(path) base = File.basename(path) - if /\A#{SEPARATOR_PAT}?\z/ =~ base + if /\A#{SEPARATOR_PAT}?\z/o =~ base return nil else return path[0, path.rindex(base)], base @@ -296,7 +296,7 @@ class Pathname def prepend_prefix(prefix, relpath) if relpath.empty? File.dirname(prefix) - elsif /#{SEPARATOR_PAT}/ =~ prefix + elsif /#{SEPARATOR_PAT}/o =~ prefix prefix = File.dirname(prefix) prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a' prefix + relpath @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_RELEASE_DATE "2009-01-25" +#define RUBY_RELEASE_DATE "2009-01-26" #define RUBY_PATCHLEVEL 5000 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |