diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2022-06-15 10:14:23 +0200 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2022-06-17 17:05:19 +0900 |
| commit | 1aaeff8e36777e4ea0ac0917e3ddc7da573c1c32 (patch) | |
| tree | e08cff38d7c1efcbeb95b94940e134699882992a /lib/rubygems | |
| parent | 5a385677f366fa093dc35ad69045bf183603427c (diff) | |
[rubygems/rubygems] Remove unnecessary condition
This variable can't be falsy.
https://github.com/rubygems/rubygems/commit/b838f9a6f0
Diffstat (limited to 'lib/rubygems')
| -rw-r--r-- | lib/rubygems/ext/cargo_builder.rb | 24 | ||||
| -rw-r--r-- | lib/rubygems/ext/ext_conf_builder.rb | 26 |
2 files changed, 23 insertions, 27 deletions
diff --git a/lib/rubygems/ext/cargo_builder.rb b/lib/rubygems/ext/cargo_builder.rb index 4c16063224..a08830319d 100644 --- a/lib/rubygems/ext/cargo_builder.rb +++ b/lib/rubygems/ext/cargo_builder.rb @@ -263,19 +263,17 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940 tmp_dest_relative = get_relative_path(tmp_dest.clone, extension_dir) - if tmp_dest_relative - full_tmp_dest = File.join(extension_dir, tmp_dest_relative) - - # TODO: remove in RubyGems 3 - if Gem.install_extension_in_lib && lib_dir - FileUtils.mkdir_p lib_dir - FileUtils.cp_r ext_path, lib_dir, remove_destination: true - end - - FileUtils::Entry_.new(full_tmp_dest).traverse do |ent| - destent = ent.class.new(dest_path, ent.rel) - destent.exist? || FileUtils.mv(ent.path, destent.path) - end + full_tmp_dest = File.join(extension_dir, tmp_dest_relative) + + # TODO: remove in RubyGems 3 + if Gem.install_extension_in_lib && lib_dir + FileUtils.mkdir_p lib_dir + FileUtils.cp_r ext_path, lib_dir, remove_destination: true + end + + FileUtils::Entry_.new(full_tmp_dest).traverse do |ent| + destent = ent.class.new(dest_path, ent.rel) + destent.exist? || FileUtils.mv(ent.path, destent.path) end ensure FileUtils.rm_rf tmp_dest if tmp_dest diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index ee70706dd4..3fd7559234 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -61,21 +61,19 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder make dest_path, results, extension_dir - if tmp_dest_relative - full_tmp_dest = File.join(extension_dir, tmp_dest_relative) - - # TODO remove in RubyGems 3 - if Gem.install_extension_in_lib and lib_dir - FileUtils.mkdir_p lib_dir - entries = Dir.entries(full_tmp_dest) - %w[. ..] - entries = entries.map {|entry| File.join full_tmp_dest, entry } - FileUtils.cp_r entries, lib_dir, :remove_destination => true - end + full_tmp_dest = File.join(extension_dir, tmp_dest_relative) + + # TODO remove in RubyGems 3 + if Gem.install_extension_in_lib and lib_dir + FileUtils.mkdir_p lib_dir + entries = Dir.entries(full_tmp_dest) - %w[. ..] + entries = entries.map {|entry| File.join full_tmp_dest, entry } + FileUtils.cp_r entries, lib_dir, :remove_destination => true + end - FileUtils::Entry_.new(full_tmp_dest).traverse do |ent| - destent = ent.class.new(dest_path, ent.rel) - destent.exist? or FileUtils.mv(ent.path, destent.path) - end + FileUtils::Entry_.new(full_tmp_dest).traverse do |ent| + destent = ent.class.new(dest_path, ent.rel) + destent.exist? or FileUtils.mv(ent.path, destent.path) end ensure ENV["DESTDIR"] = destdir |