From ff91b97c83c5e9aa67bc4032d70f0ed19b334f44 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Tue, 6 Apr 2021 11:25:10 +0900 Subject: [PATCH] The guard is to alert patchlevel of X.Y.0 --- tool/merger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/merger.rb b/tool/merger.rb index bac3e1194a..d38f00b0fd 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -116,7 +116,7 @@ class << Merger v, pl = version if relname abort "patchlevel is not -1 but '#{pl}' for preview or rc" if pl != '-1' && /-(?:preview|rc)/ =~ relname - abort "patchlevel is not 0 but '#{pl}' for the first release" if pl != '0' && /-(?:preview|rc)/ !~ relname + abort "patchlevel is not 0 but '#{pl}' for the first release" if pl != '0' && relname.end_with?(".0") pl = relname[/-(.*)\z/, 1] curver = "#{v.join('.')}#{("-#{pl}" if pl)}" if relname != curver