diff options
| author | Vít Ondruch <[email protected]> | 2023-10-23 17:12:51 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2023-11-08 09:04:28 +0900 |
| commit | ca7444cc44b1e939a31aa4366727b1ad09faa626 (patch) | |
| tree | 3149fc71c1129838ad17d4c14994cf7492de3aaf /lib/rubygems/commands/install_command.rb | |
| parent | bd5368fdec1109b3bf3dfa635f6ab1d60cfc5ddc (diff) | |
[rubygems/rubygems] Allow `--install-dir` to be specified together with `--user-install`
The combination of `install-dir` and `--user-install` used to be
disabled for no good reason. This even makes problem on Linux
distributions such as Fedora, where `--user-install` is set by default
via operating_system.rb.
The `--install-dir` is already prefered over the `--user-install` by
the implementation, therefore just drop the check.
https://github.com/rubygems/rubygems/commit/313b1c5e76
Diffstat (limited to 'lib/rubygems/commands/install_command.rb')
| -rw-r--r-- | lib/rubygems/commands/install_command.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index bbb2b08d71..9e59aee1c9 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -136,13 +136,6 @@ You can use `i` command instead of `install`. "#{program_name} [options] GEMNAME [GEMNAME ...] -- --build-flags" end - def check_install_dir # :nodoc: - if options[:install_dir] && options[:user_install] - alert_error "Use --install-dir or --user-install but not both" - terminate_interaction 1 - end - end - def check_version # :nodoc: if options[:version] != Gem::Requirement.default && get_all_gem_names.size > 1 @@ -162,7 +155,6 @@ You can use `i` command instead of `install`. ENV.delete "GEM_PATH" if options[:install_dir].nil? - check_install_dir check_version load_hooks |