diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-05 10:07:41 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-05 10:07:41 +0000 |
| commit | 9b9654c3c3d9c42572531752cbb88b6fd906a9be (patch) | |
| tree | 50dd6508361ccd57692f950b648cb5f8b75c73f9 | |
| parent | 2967707b32fc4cd59c4685f276aaf62d6a80a6cf (diff) | |
| download | ruby-9b9654c3c3d9c42572531752cbb88b6fd906a9be.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/fileutils.rb | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -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 diff --git a/lib/fileutils.rb b/lib/fileutils.rb index cee60892fa..806ee2544f 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -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) |