nagachika	2013-07-07 01:58:40 +0900 (Sun, 07 Jul 2013)

  New Revision: 41811

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

  Log:
    merge revision(s) 41781: [Backport #8604]
    
    * lib/fileutils.rb (FileUtils#symbolic_modes_to_i): Fix the wrong
      character class [+-=], which happened to match all desired
      characters but also match undesired characters.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/fileutils.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41810)
+++ ruby_2_0_0/ChangeLog	(revision 41811)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jul  7 01:58:25 2013  Akinori MUSHA  <knu@i...>
+
+	* lib/fileutils.rb (FileUtils#symbolic_modes_to_i): Fix the wrong
+	  character class [+-=], which happened to match all desired
+	  characters but also match undesired characters.
+
 Sun Jul  7 01:54:44 2013  Akinori MUSHA  <knu@i...>
 
 	* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): Fix the
Index: ruby_2_0_0/lib/fileutils.rb
===================================================================
--- ruby_2_0_0/lib/fileutils.rb	(revision 41810)
+++ ruby_2_0_0/lib/fileutils.rb	(revision 41811)
@@ -904,8 +904,8 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/fileutils.rb#L904
   def symbolic_modes_to_i(modes, path)  #:nodoc:
     current_mode = (File.stat(path).mode & 07777)
     modes.split(/,/).inject(0) do |mode, mode_sym|
-      mode_sym = "a#{mode_sym}" if mode_sym =~ %r!^[+-=]!
-      target, mode = mode_sym.split %r![+-=]!
+      mode_sym = "a#{mode_sym}" if mode_sym =~ %r!^[=+-]!
+      target, mode = mode_sym.split %r![=+-]!
       user_mask = user_mask(target)
       mode_mask = mode_mask(mode ? mode : "", path)
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41810)
+++ ruby_2_0_0/version.h	(revision 41811)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-07-07"
-#define RUBY_PATCHLEVEL 253
+#define RUBY_PATCHLEVEL 254
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41781


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