summaryrefslogtreecommitdiff
path: root/tool/make-snapshot
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-23 17:12:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-23 17:12:25 +0000
commit730c94172800dd3e4d6dbea42845b3c5500a8171 (patch)
treec303255d594a30951880dd770eb384cc4ec487ca /tool/make-snapshot
parentb1186bf39f4e9451b1c743ff8793034705f2dfa8 (diff)
make-snapshot: fix stable snapshot
* tool/make-snapshot (package): VCS#branch_list expects glob a pattern string but not a regexp. based on the patch by Vit Ondruch. in [ruby-core:67064]. [Bug #10636] * tool/vcs.rb (VCS::SVN#branch_list): strip newlines. * tool/vcs.rb (VCS::GIT.get_revisions): retrieve modified time from toplevel log too. * tool/vcs.rb (VCS::GIT#branch_list): yield for each lines. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/make-snapshot')
-rwxr-xr-xtool/make-snapshot2
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 0c24532..46387cf 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -139,7 +139,7 @@ def package(vcs, rev, destdir, tmp = nil)
when /\Atags\//
url = vcs.tag($')
when /\Astable\z/
- vcs.branch_list(/ruby_[0-9]*/) {|n| url = /\Aruby_\d+_\d+\z/ =~ n}
+ vcs.branch_list("ruby_[0-9]*") {|n| url = n[/\Aruby_\d+_\d+\z/]}
url &&= vcs.branch(url)
when /\A(.*)\.(.*)\.(.*)-(preview|rc)(\d+)/
prerelease = true