summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2021-08-01 18:31:21 +0900
committernagachika <nagachika@ruby-lang.org>2021-08-01 18:31:21 +0900
commita4d2e48c735b3cd4d2af9c71d16d49175d70fef6 (patch)
treeb217eb9abc651492b08bfbcd313dd746fbaa23a2
parent6f4ab641bb1035c5811e42e43320112e4a502a0e (diff)
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(-)
-rwxr-xr-xtool/make-snapshot2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 131d7b91c9..ec9eb3db35 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -52,7 +52,7 @@ PACKAGES = {
"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 aa07ff3583..636eb2824f 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@
# 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