summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-30 15:28:55 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-30 15:28:55 +0000
commit210efb5c3e6f7bad3b2651990a400f8d3d62ca5c (patch)
treef30fd184d075258b5b861fbc3c4ea3f083e9f2a5 /tool
parente5bcf05d664fcb7e564bb95b2817a29c810fb7ef (diff)
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
Diffstat (limited to 'tool')
-rwxr-xr-xtool/make-snapshot2
1 files changed, 1 insertions, 1 deletions
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"