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) 66973: [Backport #15577]

Browse source 
Run r66972 assertion only when a sticky-bit makes sense

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2019-03-11 07:18:45 +00:00
parent a6be951e29
commit 50a334d864
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/fileutils/test_fileutils.rb
View file

@ -742,13 +742,14 @@ class TestFileUtils < Test::Unit::TestCase
assert_file_not_exist 'tmp/tmpdir/c' assert_file_not_exist 'tmp/tmpdir/c'
File.chmod(01777, 'tmp/tmpdir') File.chmod(01777, 'tmp/tmpdir')
if File.sticky?('tmp/tmpdir')
Dir.mkdir 'tmp/tmpdir/d', 0 Dir.mkdir 'tmp/tmpdir/d', 0
assert_raise(Errno::EACCES) {remove_entry_secure 'tmp/tmpdir/d'} assert_raise(Errno::EACCES) {remove_entry_secure 'tmp/tmpdir/d'}
File.chmod 0777, 'tmp/tmpdir/d' File.chmod 0777, 'tmp/tmpdir/d'
Dir.rmdir 'tmp/tmpdir/d' Dir.rmdir 'tmp/tmpdir/d'
end
Dir.rmdir 'tmp/tmpdir' Dir.rmdir 'tmp/tmpdir'
end end
def test_remove_entry_secure_symlink def test_remove_entry_secure_symlink

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.1" #define RUBY_VERSION "2.6.1"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #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_YEAR 2019
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3