diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-06 16:57:50 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-06 16:57:50 +0000 |
| commit | 26dc19024774eb5c412d8957569f6c2a4e9af6f5 (patch) | |
| tree | a2ab37b4741eaea30081d70688e66e513f5ad635 /lib | |
| parent | b4359a3a43389be5ebb0d7f6bdd3624c353e624f (diff) | |
merge revision(s) 41796:
* 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/branches/ruby_2_0_0@41810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fileutils.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 8daf923c78..d3bc0834e1 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1023,7 +1023,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) @@ -1053,7 +1053,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) |