summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-12 08:30:17 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-12 08:30:17 +0000
commit371e57550d211636917103b45175c2b11c7b9d40 (patch)
tree5309de4d9e2f732fde80a095bf2474a6a304fcda
parentdd19c29f867a20d06ee793d106df333ea5ef9b35 (diff)
* lib/fileutils.rb (FileUtils::mv): fix incomplete backport of
FileUtils.mv changes at r11988 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/fileutils.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 03984ac3de6..012898e06fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 12 17:22:44 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/fileutils.rb (FileUtils::mv): fix incomplete backport of
+ FileUtils.mv changes at r11988
+
Mon Mar 12 16:09:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* mkconfig.rb (patchlevel): read from version.h.
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index decd792eeca..0c20362158b 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -484,7 +484,7 @@ module FileUtils
# FileUtils.mv Dir.glob('test*.rb'), 'test', :noop => true, :verbose => true
#
def mv(src, dest, options = {})
- fu_check_options options, :force, :noop, :verbose
+ fu_check_options options, :force, :noop, :verbose, :secure
fu_output_message "mv#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
return if options[:noop]
fu_each_src_dest(src, dest) do |s, d|
diff --git a/version.h b/version.h
index 2d38ea5c79c..705e53d04f3 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-03-12"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20070312
-#define RUBY_PATCHLEVEL 32
+#define RUBY_PATCHLEVEL 33
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8