https://git.ruby-lang.org/ruby.git/commit/?id=80c180df76

From 80c180df769016d58663218de2687613841864f3 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Wed, 4 Aug 2021 12:40:12 +0900
Subject: merge revision(s) b8386f7f7f6d7a7d76481e02d389d0f5211f0f2c:

	Prepend DebugSystem to VCS class only

	And revert 24e5f1c982966c379220b1bbb26b4e0320180fa1, pepending to
	Kernel did not affect the top level methods before 3.0.
	---
	 tool/lib/vcs.rb    | 3 ---
	 tool/make-snapshot | 2 +-
	 2 files changed, 1 insertion(+), 4 deletions(-)
---
 tool/lib/vcs.rb    | 3 ---
 tool/make-snapshot | 2 +-
 version.h          | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index 0c01abb..c6d6cdd 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -52,9 +52,6 @@ module DebugSystem https://github.com/ruby/ruby/blob/trunk/tool/lib/vcs.rb#L52
     ret
   end
 end
-module Kernel
-  prepend(DebugSystem)
-end
 
 class VCS
   prepend(DebugSystem) if defined?(DebugSystem)
diff --git a/tool/make-snapshot b/tool/make-snapshot
index ec9eb3d..131d7b9 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -52,7 +52,7 @@ PACKAGES = { https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L52
   "zip"  => %w".zip     zip -Xqr",
 }
 DEFAULT_PACKAGES = PACKAGES.keys - ["tar"]
-if !$no7z and system("7z", out: IO::NULL, exception: false)
+if !$no7z and system("7z", out: IO::NULL)
   PACKAGES["gzip"] = %w".tar.gz 7z a dummy -tgzip -mx -so"
   PACKAGES["zip"]  = %w".zip    7z a -tzip -l -mx -mtc=off" << {out: IO::NULL}
 elsif gzip = ENV.delete("GZIP")
diff --git a/version.h b/version.h
index 636eb28..0acb3ed 100644
--- a/version.h
+++ b/version.h
@@ -12,11 +12,11 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 120
+#define RUBY_PATCHLEVEL 121
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"
 
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/