kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 27400:

Browse source 
* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
	  destroyed otherwise.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-06-08 06:31:50 +00:00
parent 6e37bdc69f
commit 9252cb7d33
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jun 8 15:33:30 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
destroyed otherwise.
Tue Jun 8 15:27:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Jun 8 15:27:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (search_required): expand home relative path first. * eval.c (search_required): expand home relative path first.

1
lib/fileutils.rb
View file

@ -418,6 +418,7 @@ module FileUtils
fu_check_options options, OPT_TABLE['cp_r'] fu_check_options options, OPT_TABLE['cp_r']
fu_output_message "cp -r#{options[:preserve] ? 'p' : ''}#{options[:remove_destination] ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose] fu_output_message "cp -r#{options[:preserve] ? 'p' : ''}#{options[:remove_destination] ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
return if options[:noop] return if options[:noop]
options = options.dup
options[:dereference_root] = true unless options.key?(:dereference_root) options[:dereference_root] = true unless options.key?(:dereference_root)
fu_each_src_dest(src, dest) do |s, d| fu_each_src_dest(src, dest) do |s, d|
copy_entry s, d, options[:preserve], options[:dereference_root], options[:remove_destination] copy_entry s, d, options[:preserve], options[:dereference_root], options[:remove_destination]

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-06-08" #define RUBY_RELEASE_DATE "2010-06-08"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20100608 #define RUBY_RELEASE_CODE 20100608
#define RUBY_PATCHLEVEL 275 #define RUBY_PATCHLEVEL 276
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8