[前][次][番号順一覧][スレッド一覧]

ruby-changes:27863

From: nagachika <ko1@a...>
Date: Mon, 25 Mar 2013 01:23:16 +0900 (JST)
Subject: [ruby-changes:27863] nagachika:r39915 (ruby_2_0_0): merge revision(s) 39614: [Backport #8033]

nagachika	2013-03-25 01:23:02 +0900 (Mon, 25 Mar 2013)

  New Revision: 39915

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

  Log:
    merge revision(s) 39614: [Backport #8033]
    
    configure.in: fix unexpand_shvar
    
    * configure.in (unexpand_shvar): remove guarding quotes at last.

  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 39914)
+++ ruby_2_0_0/configure.in	(revision 39915)
@@ -3244,7 +3244,7 @@ unexpand_shvar() { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L3244
 	fi
     done
     expr=['s/${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g']
-    eval $var='"`echo \"\\\"${'$var'}\\\"\" | sed \"$expr;s/\\\"\\\"//g;s/^\\\"//;s/\\\"\\\$//\"`"'
+    eval $var='"`echo \"\\\"${'$var'}\\\"\" | sed \"$expr;s/\\\"//g\"`"'
 }
 
 rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39914)
+++ ruby_2_0_0/version.h	(revision 39915)
@@ -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-03-25"
-#define RUBY_PATCHLEVEL 92
+#define RUBY_PATCHLEVEL 93
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

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


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

[前][次][番号順一覧][スレッド一覧]