ruby-changes:69745
From: Hiroshi <ko1@a...>
Date: Tue, 16 Nov 2021 20:20:13 +0900 (JST)
Subject: [ruby-changes:69745] 1ff7b9cac4 (master): Added LICENSE entry of vendored thor to LEGAL
https://git.ruby-lang.org/ruby.git/commit/?id=1ff7b9cac4 From 1ff7b9cac4b89d295f7b9d8029ab7530c88662d5 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Tue, 16 Nov 2021 19:48:32 +0900 Subject: Added LICENSE entry of vendored thor to LEGAL --- LEGAL | 9 +++++++++ tool/sync_default_gems.rb | 1 + 2 files changed, 10 insertions(+) diff --git a/LEGAL b/LEGAL index 57804508ebf..8ee219d6930 100644 --- a/LEGAL +++ b/LEGAL @@ -969,6 +969,15 @@ mentioned below. https://github.com/ruby/ruby/blob/trunk/LEGAL#L969 {MIT License}[rdoc-label:label-MIT+License] +[lib/bundler/vendor/thor] + + Thor is under the following license. + + >>> + Copyright (c) 2008 Yehuda Katz, Eric Hodel, et al. + + {MIT License}[rdoc-label:label-MIT+License] + [lib/did_you_mean] [lib/did_you_mean.rb] [test/did_you_mean] diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index bd25d7b75b3..9b025fa4f6e 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -104,6 +104,7 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L104 cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/rubocop_gems*"), "tool/bundler") cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/standard_gems*"), "tool/bundler") rm_rf(%w[spec/bundler/support/artifice/vcr_cassettes]) + rm_rf("lib/bundler/vendor/thor/LICENSE.md") when "rdoc" rm_rf(%w[lib/rdoc lib/rdoc.rb test/rdoc libexec/rdoc libexec/ri]) cp_r(Dir.glob("#{upstream}/lib/rdoc*"), "lib") -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/