nagachika	2013-03-20 01:12:47 +0900 (Wed, 20 Mar 2013)

  New Revision: 39825

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

  Log:
    merge revision(s) 39525: [Backport #8102]
    
    configure.in: escape double-quotes
    
    * configure.in (unexpand_shvar): escape double-quotes in backquotes in
      double-quotes for some shells.  [Bug #7959]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/configure.in
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 39824)
+++ ruby_2_0_0/configure.in	(revision 39825)
@@ -3208,7 +3208,7 @@ unexpand_shvar() { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L3208
     test "$#" -eq 0 && return
     for n do
         eval v='"$'$n'"'
-	v="`echo \"$v\" | sed -e ['s/${[^${}"]*}/"&"/g'] -e ['s/[][$|.\\?*]/\\\\&/g']`"
+	v="`echo \"$v\" | sed -e ['s/${[^${}\"]*}/\"&\"/g'] -e ['s/[][$|.\\?*]/\\\\&/g']`"
 	if test -n "$v"; then
 	    expr=["${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g"]
 	    AS_CASE(["$v"], [*'${'*'}'*], [expr=["$expr;s|$v|\"\${$n}\"|g"]])
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39824)
+++ ruby_2_0_0/version.h	(revision 39825)
@@ -1,10 +1,10 @@ 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-03-18"
-#define RUBY_PATCHLEVEL 72
+#define RUBY_RELEASE_DATE "2013-03-20"
+#define RUBY_PATCHLEVEL 73
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 20
 
 #include "ruby/version.h"
 

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


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