[前][次][番号順一覧][スレッド一覧]

ruby-changes:66890

From: Nobuyoshi <ko1@a...>
Date: Mon, 26 Jul 2021 14:19:29 +0900 (JST)
Subject: [ruby-changes:66890] 24e5f1c982 (master): Ignore 7z unless available

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

From 24e5f1c982966c379220b1bbb26b4e0320180fa1 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 26 Jul 2021 14:17:30 +0900
Subject: 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(-)

diff --git a/tool/make-snapshot b/tool/make-snapshot
index 589d742..1e56f94 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -56,7 +56,7 @@ PACKAGES = { https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L56
   "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")
-- 
cgit v1.1


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

[前][次][番号順一覧][スレッド一覧]