naruse	2019-03-11 16:18:45 +0900 (Mon, 11 Mar 2019)

  New Revision: 67210

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

  Log:
    merge revision(s) 66973: [Backport #15577]
    
    Run r66972 assertion only when a sticky-bit makes sense

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/test/fileutils/test_fileutils.rb
    branches/ruby_2_6/version.h
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 67209)
+++ ruby_2_6/version.h	(revision 67210)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.1"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 43
+#define RUBY_PATCHLEVEL 44
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_6/test/fileutils/test_fileutils.rb
===================================================================
--- ruby_2_6/test/fileutils/test_fileutils.rb	(revision 67209)
+++ ruby_2_6/test/fileutils/test_fileutils.rb	(revision 67210)
@@ -742,13 +742,14 @@ class TestFileUtils < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/ruby_2_6/test/fileutils/test_fileutils.rb#L742
     assert_file_not_exist 'tmp/tmpdir/c'
 
     File.chmod(01777, 'tmp/tmpdir')
-    Dir.mkdir 'tmp/tmpdir/d', 0
-    assert_raise(Errno::EACCES) {remove_entry_secure 'tmp/tmpdir/d'}
-    File.chmod 0777, 'tmp/tmpdir/d'
-    Dir.rmdir 'tmp/tmpdir/d'
+    if File.sticky?('tmp/tmpdir')
+      Dir.mkdir 'tmp/tmpdir/d', 0
+      assert_raise(Errno::EACCES) {remove_entry_secure 'tmp/tmpdir/d'}
+      File.chmod 0777, 'tmp/tmpdir/d'
+      Dir.rmdir 'tmp/tmpdir/d'
+    end
 
     Dir.rmdir 'tmp/tmpdir'
-
   end
 
   def test_remove_entry_secure_symlink
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 67209)
+++ ruby_2_6	(revision 67210)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r66973

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