diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-02 03:07:17 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-02 03:07:17 +0000 |
| commit | 4077b9b89dc1f139775774e59705677e54712cba (patch) | |
| tree | 7a143699fc3117cd2827eb769b96f58e8259cae7 /lib/fileutils.rb | |
| parent | 2ae0c4c44bda180ec75ce8e571840e8b9667a7e5 (diff) | |
| download | ruby-4077b9b89dc1f139775774e59705677e54712cba.tar.gz | |
* lib/fileutils.rb: chmod/chmod_R with a string mode (e.g., "+x")
caused error in verbose mode.
* test/fileutils/test_fileutils.rb: add a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/fileutils.rb')
| -rw-r--r-- | lib/fileutils.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index af2d19ac61..57ab0cf77a 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -996,6 +996,10 @@ private mode.is_a?(String) ? symbolic_modes_to_i(mode, path) : mode end + def mode_to_s(mode) #:nodoc: + mode.is_a?(String) ? mode : "%o" % mode + end + public # @@ -1034,7 +1038,7 @@ public def chmod(mode, list, options = {}) fu_check_options options, OPT_TABLE['chmod'] list = fu_list(list) - fu_output_message sprintf('chmod %o %s', mode, list.join(' ')) if options[:verbose] + fu_output_message sprintf('chmod %s %s', mode_to_s(mode), list.join(' ')) if options[:verbose] return if options[:noop] list.each do |path| Entry_.new(path).chmod(fu_mode(mode, path)) @@ -1055,9 +1059,9 @@ public def chmod_R(mode, list, options = {}) fu_check_options options, OPT_TABLE['chmod_R'] list = fu_list(list) - fu_output_message sprintf('chmod -R%s %o %s', + fu_output_message sprintf('chmod -R%s %s %s', (options[:force] ? 'f' : ''), - mode, list.join(' ')) if options[:verbose] + mode_to_s(mode), list.join(' ')) if options[:verbose] return if options[:noop] list.each do |root| Entry_.new(root).traverse do |ent| |