merge revision(s) 42459: [Backport #8963]

	* tool/make-snapshot: Fix order of priority for option parameter.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ff3a4d463..4d99bb49d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct  1 00:28:40 2013  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/make-snapshot: Fix order of priority for option parameter.
+
 Sat Sep 28 21:40:40 2013  Kenichi Kamiya  <kachick1@gmail.com>
 
 	* random.c (rb_random_ulong_limited): coerce before check negative.
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 2c0db91cd4..117d62524c 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -244,7 +244,7 @@ def package(rev, destdir)
           ["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"
diff --git a/version.h b/version.h
index 644d74816f..db3df942c7 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"