diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-21 16:29:33 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-21 16:29:33 +0000 |
| commit | 4ad3bc978be2f128937620b9f046e384ddc04541 (patch) | |
| tree | 814cdeda769c99665eca251a7919feb4bbf8e992 | |
| parent | 2f16501a1333936a71baf8709ed94dd437acd51a (diff) | |
| download | ruby-4ad3bc978be2f128937620b9f046e384ddc04541.tar.gz ruby-4ad3bc978be2f128937620b9f046e384ddc04541.tar.xz ruby-4ad3bc978be2f128937620b9f046e384ddc04541.zip | |
* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
[ruby-dev:39153]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Aug 22 01:29:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists. + [ruby-dev:39153] + Sat Aug 22 00:48:08 2009 Tanaka Akira <akr@fsij.org> * enumerator.c (ary2sv): add dup argument. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c5e4bd89b..8d6fc9679 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -194,11 +194,13 @@ class Array end def rm_f(*files) - FileUtils.rm_f(Dir[*files]) + opt = ([files.pop] if Hash === files.last) + FileUtils.rm_f(Dir[*files], *opt) end def rm_rf(*files) - FileUtils.rm_rf(Dir[*files]) + opt = ([files.pop] if Hash === files.last) + FileUtils.rm_rf(Dir[*files], *opt) end # Returns time stamp of the +target+ file if it exists and is newer |