diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-09 07:01:59 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-09 07:01:59 +0000 |
| commit | 02f61f874af05058b3f0ee2f59729668ced59cd4 (patch) | |
| tree | d1de6a3ac01dee54315ac2aa008c18fb3c1fd7b5 /lib | |
| parent | 8ce3f4beeaf99c0e094f7a246613b6439f902e8c (diff) | |
* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): If user
and group are both nil, print ":".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fileutils.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 806ee2544f..86d959046b 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1044,8 +1044,8 @@ module FileUtils def chown(user, group, list, options = {}) fu_check_options options, OPT_TABLE['chown'] list = fu_list(list) - fu_output_message sprintf('chown %s%s', - (group ? [user,group].join(':') : user) + ' ', + fu_output_message sprintf('chown %s %s', + (group ? "#{user}:#{group}" : user || ':'), list.join(' ')) if options[:verbose] return if options[:noop] uid = fu_get_uid(user) @@ -1073,9 +1073,9 @@ module FileUtils def chown_R(user, group, list, options = {}) fu_check_options options, OPT_TABLE['chown_R'] list = fu_list(list) - fu_output_message sprintf('chown -R%s %s%s', + fu_output_message sprintf('chown -R%s %s %s', (options[:force] ? 'f' : ''), - (group ? [user,group].join(':') : user) + ' ', + (group ? "#{user}:#{group}" : user || ':'), list.join(' ')) if options[:verbose] return if options[:noop] uid = fu_get_uid(user) |