nagachika	2013-10-01 00:28:55 +0900 (Tue, 01 Oct 2013)

  New Revision: 43100

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

  Log:
    merge revision(s) 42459: [Backport #8963]
    
    * tool/make-snapshot: Fix order of priority for option parameter.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/tool/make-snapshot
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 43099)
+++ ruby_2_0_0/ChangeLog	(revision 43100)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Oct  1 00:28:40 2013  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* tool/make-snapshot: Fix order of priority for option parameter.
+
 Sat Sep 28 21:40:40 2013  Kenichi Kamiya  <kachick1@g...>
 
 	* random.c (rb_random_ulong_limited): coerce before check negative.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43099)
+++ ruby_2_0_0/version.h	(revision 43100)
@@ -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-09-28"
-#define RUBY_PATCHLEVEL 322
+#define RUBY_RELEASE_DATE "2013-10-01"
+#define RUBY_PATCHLEVEL 323
 
 #define RUBY_RELEASE_YEAR 2013
-#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 10
+#define RUBY_RELEASE_DAY 1
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/tool/make-snapshot
===================================================================
--- ruby_2_0_0/tool/make-snapshot	(revision 43099)
+++ ruby_2_0_0/tool/make-snapshot	(revision 43100)
@@ -244,7 +244,7 @@ def package(rev, destdir) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/make-snapshot#L244
           ["gzip tarball", ".tar.gz", %w"tar czf"],
           ["zip archive", ".zip", %w"zip -qr"]
          ].collect do |mesg, ext, cmd|
-    file = File.join(destdir, "#{v||$archname}#{ext}")
+    file = File.join(destdir, "#{$archname||v}#{ext}")
     print "creating #{mesg}... #{file}"
     if system(*(cmd + [file, v]))
       puts " done"

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


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