nagachika	2013-07-07 01:57:50 +0900 (Sun, 07 Jul 2013)

  New Revision: 41810

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41810

  Log:
    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".

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/fileutils.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41809)
+++ ruby_2_0_0/ChangeLog	(revision 41810)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jul  7 01:54:44 2013  Akinori MUSHA  <knu@i...>
+
+	* 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 00:55:05 2013  NARUSE, Yui  <naruse@r...>
 
 	* regcomp.c (): Merge Onigmo 5.13.5 23b523076d6f1161.
Index: ruby_2_0_0/lib/fileutils.rb
===================================================================
--- ruby_2_0_0/lib/fileutils.rb	(revision 41809)
+++ ruby_2_0_0/lib/fileutils.rb	(revision 41810)
@@ -1023,7 +1023,7 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/fileutils.rb#L1023
     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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/fileutils.rb#L1053
     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)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41809)
+++ ruby_2_0_0/version.h	(revision 41810)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-07-07"
-#define RUBY_PATCHLEVEL 252
+#define RUBY_PATCHLEVEL 253
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41796


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/