nagachika	2014-11-05 00:15:04 +0900 (Wed, 05 Nov 2014)

  New Revision: 48273

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

  Log:
    merge revision(s) r46397: [Backport #10434]
    
    envutil.rb: avoid error on OS X 10.10
    
    * test/ruby/envutil.rb (diagnostic_reports): Mac OS X 10.10 may
      not create plist file with crash file together.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/test/ruby/envutil.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 48272)
+++ ruby_2_1/version.h	(revision 48273)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2014-11-05"
-#define RUBY_PATCHLEVEL 268
+#define RUBY_PATCHLEVEL 269
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 11
Index: ruby_2_1/test/ruby/envutil.rb
===================================================================
--- ruby_2_1/test/ruby/envutil.rb	(revision 48272)
+++ ruby_2_1/test/ruby/envutil.rb	(revision 48273)
@@ -192,7 +192,7 @@ module EnvUtil https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/envutil.rb#L192
           log = File.read(name) rescue next
           if /\AProcess:\s+#{cmd} \[#{pid}\]$/ =~ log
             File.unlink(name)
-            File.unlink("#{path}/.#{File.basename(name)}.plist")
+            File.unlink("#{path}/.#{File.basename(name)}.plist") rescue nil
             return log
           end
         end

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46397


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