diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-26 06:49:46 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-26 06:49:46 +0000 |
| commit | 42f8a6436bca3dc64f1bf085737b5740175c9553 (patch) | |
| tree | 1dc4582fdd105034f01d720c1900b38aa90160ca /lib | |
| parent | 303c55737486ea5b708cf1569b6633a1f6c4ac44 (diff) | |
| download | ruby-42f8a6436bca3dc64f1bf085737b5740175c9553.tar.gz ruby-42f8a6436bca3dc64f1bf085737b5740175c9553.tar.xz ruby-42f8a6436bca3dc64f1bf085737b5740175c9553.zip | |
* lib/pathname.rb (chop_basename, prepend_prefix): use o option.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pathname.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |