1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): Fix the

wrong output message when user is nil, which should be "chown
  :group file" instead of "chown group file".

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2013-07-05 10:07:41 +00:00
parent 2967707b32
commit 9b9654c3c3
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
Fri Jul 5 19:05:40 2013 Akinori MUSHA <knu@iDaemons.org>
* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): Fix the
wrong output message when user is nil, which should be "chown
:group file" instead of "chown group file".
Fri Jul 5 16:21:56 2013 Akinori MUSHA <knu@iDaemons.org>
* test/ruby/test_regexp.rb

View file

@ -1045,7 +1045,7 @@ module FileUtils
fu_check_options options, OPT_TABLE['chown']
list = fu_list(list)
fu_output_message sprintf('chown %s%s',
[user,group].compact.join(':') + ' ',
(group ? [user,group].join(':') : user) + ' ',
list.join(' ')) if options[:verbose]
return if options[:noop]
uid = fu_get_uid(user)
@ -1075,7 +1075,7 @@ module FileUtils
list = fu_list(list)
fu_output_message sprintf('chown -R%s %s%s',
(options[:force] ? 'f' : ''),
[user,group].compact.join(':') + ' ',
(group ? [user,group].join(':') : user) + ' ',
list.join(' ')) if options[:verbose]
return if options[:noop]
uid = fu_get_uid(user)