nagachika	2013-03-11 00:48:20 +0900 (Mon, 11 Mar 2013)

  New Revision: 39702

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

  Log:
    merge revision(s) 39481: [Backport #7941]
    
    * configure.in (unexpand_shvar): Use the numeric comparison
      operator instead of '==' which is a ksh extention. [Bug #7941]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    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 39701)
+++ ruby_2_0_0/configure.in	(revision 39702)
@@ -3205,7 +3205,7 @@ shvar_to_cpp() { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L3205
 unexpand_shvar() {
     local var=$1 val n v expr quote
     shift
-    test "$#" == 0 && return
+    test "$#" -eq 0 && return
     quote=['s/${[^${}"]*}/"&"/g']
     for n do
         eval v='"$'$n'"'
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39701)
+++ ruby_2_0_0/ChangeLog	(revision 39702)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar 11 00:47:47 2013  Akinori MUSHA  <knu@i...>
+
+	* configure.in (unexpand_shvar): Use the numeric comparison
+	  operator instead of '==' which is a ksh extention. [Bug #7941]
+
 Sun Mar 10 00:01:07 2013  Tadayoshi Funaba  <tadf@d...>
 
 	* ext/date/date_core.c: [ruby-core:52303]
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39701)
+++ ruby_2_0_0/version.h	(revision 39702)
@@ -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-10"
-#define RUBY_PATCHLEVEL 46
+#define RUBY_RELEASE_DATE "2013-03-11"
+#define RUBY_PATCHLEVEL 47
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 

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


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