From b2bbfb3e1836db4c48bc6ebae63af96be85d380b Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 1 Nov 2012 18:22:31 +0000 Subject: [PATCH] * tool/make-snapshot: fix wrong regexp for releasing preview. patched by mame. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ tool/make-snapshot | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9008bb26b5..479dd9ba25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 1 23:06:01 2012 NARUSE, Yui + + * tool/make-snapshot: fix wrong regexp for releasing preview. + patched by mame. + Thu Nov 1 22:27:11 2012 Koichi Sasada * NEWS: add a news about objspace, diff --git a/tool/make-snapshot b/tool/make-snapshot index 00131507a4..b2d700dc26 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -100,10 +100,13 @@ def package(rev, destdir) when /\Astable\z/ url = SVNURL + "branches/" url = url + `svn ls #{url}`[/.*^(ruby_\d+_\d+)\//m, 1] - when /\A(.*)\.(.*)\.(.*)-((?!preview)p)?(.*)/ - patchlevel = !!$4 + when /\A(.*)\.(.*)\.(.*)-(preview|rc)(\d+)/ tag = "#{$4}#{$5}" - url = SVNURL + "tags/v#{$1}_#{$2}_#{$3}_#{$5}" + url = SVNURL + "tags/v#{$1}_#{$2}_#{$3}_#{$4}#{$5}" + when /\A(.*)\.(.*)\.(.*)-p(\d+)/ + patchlevel = true + tag = "p#{$4}" + url = SVNURL + "tags/v#{$1}_#{$2}_#{$3}_#{$4}" when /\./ url = SVNURL + "branches/ruby_#{rev.tr('.', '_')}" else