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

From a4d2e48c735b3cd4d2af9c71d16d49175d70fef6 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sun, 1 Aug 2021 18:31:21 +0900
Subject: merge revision(s) 24e5f1c982966c379220b1bbb26b4e0320180fa1:

	Ignore 7z unless available

	`DebugSystem#system` is prepended in vcs.rb and defaulted to
	`exception: true`.
	---
	 tool/make-snapshot | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
---
 tool/make-snapshot | 2 +-
 version.h          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tool/make-snapshot b/tool/make-snapshot
index 131d7b9..ec9eb3d 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)
+if !$no7z and system("7z", out: IO::NULL, exception: false)
   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 aa07ff3..636eb28 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@ 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 119
+#define RUBY_PATCHLEVEL 120
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 8
-- 
cgit v1.1


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