diff --git a/ChangeLog b/ChangeLog index 6f0f295332..6551ac3f86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jul 13 23:27:12 2013 Akinori MUSHA + + * lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): If user + and group are both nil, print ":". + Sat Jul 13 23:16:49 2013 Tanaka Akira * bignum.c (bigrsh_bang): Fix bignum digits overrun. diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 723ad91000..8b001cc6d7 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1022,8 +1022,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) @@ -1051,9 +1051,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) diff --git a/version.h b/version.h index c6af636702..fd195d2791 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-07-13" -#define RUBY_PATCHLEVEL 258 +#define RUBY_PATCHLEVEL 259 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 7