summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-07-26 15:43:46 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-07-26 15:44:40 +0900
commitb8386f7f7f6d7a7d76481e02d389d0f5211f0f2c (patch)
tree268f33970d6e2834ab5598388f5399b39da87d4d /tool
parent24e5f1c982966c379220b1bbb26b4e0320180fa1 (diff)
downloadruby-b8386f7f7f6d7a7d76481e02d389d0f5211f0f2c.tar.gz
Prepend DebugSystem to VCS class only
And revert 24e5f1c982966c379220b1bbb26b4e0320180fa1, pepending to Kernel did not affect the top level methods before 3.0.
Diffstat (limited to 'tool')
-rw-r--r--tool/lib/vcs.rb3
-rwxr-xr-xtool/make-snapshot2
2 files changed, 1 insertions, 4 deletions
diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index b146dfe3aa..5d78d94c26 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -52,9 +52,6 @@ module DebugSystem
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 1e56f94e0f..589d742e50 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -56,7 +56,7 @@ PACKAGES = {
"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")