aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xtool/make-snapshot2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bb3489196..7474646a44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug 9 14:02:01 2013 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * tool/make-snapshot: Fix order of priority for option parameter.
+
Fri Aug 9 12:06:49 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_str_normalize_ospath): normalize to Normalization Form C
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 81f4cb0658..962ac07d9d 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -251,7 +251,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"