Optimize operating_system.rb a bit.
It would be better to stay with --{install-dir,bindir} pair, but this is currently broken and it does not currently generate documentation: https://github.com/rubygems/rubygems/issues/1470
This commit is contained in:
parent
c40aeb5071
commit
651be7da37
|
@ -116,10 +116,10 @@ module Gem
|
||||||
# RubyGems default overrides.
|
# RubyGems default overrides.
|
||||||
|
|
||||||
def default_dir
|
def default_dir
|
||||||
scl_prefix = ENV['X_SCLS'].split(' ').detect {|c| c != '@SCL@'}
|
|
||||||
scl_prefix = scl_prefix ? scl_prefix + '_': nil
|
|
||||||
|
|
||||||
if opt_build_root?
|
if opt_build_root?
|
||||||
|
scl_prefix = ENV['X_SCLS'].split(' ').detect {|c| c != '@SCL@'}
|
||||||
|
scl_prefix = scl_prefix ? scl_prefix + '_': nil
|
||||||
|
|
||||||
Gem.default_dirs[:"#{scl_prefix}system"][:gem_dir]
|
Gem.default_dirs[:"#{scl_prefix}system"][:gem_dir]
|
||||||
elsif Process.uid == 0
|
elsif Process.uid == 0
|
||||||
Gem.default_dirs[:local][:gem_dir]
|
Gem.default_dirs[:local][:gem_dir]
|
||||||
|
@ -134,10 +134,10 @@ module Gem
|
||||||
end
|
end
|
||||||
|
|
||||||
def default_bindir
|
def default_bindir
|
||||||
scl_prefix = ENV['X_SCLS'].split(' ').detect {|c| c != '@SCL@'}
|
|
||||||
scl_prefix = scl_prefix ? scl_prefix + '_': nil
|
|
||||||
|
|
||||||
if opt_build_root?
|
if opt_build_root?
|
||||||
|
scl_prefix = ENV['X_SCLS'].split(' ').detect {|c| c != '@SCL@'}
|
||||||
|
scl_prefix = scl_prefix ? scl_prefix + '_': nil
|
||||||
|
|
||||||
Gem.default_dirs[:"#{scl_prefix}system"][:bin_dir]
|
Gem.default_dirs[:"#{scl_prefix}system"][:bin_dir]
|
||||||
elsif Process.uid == 0
|
elsif Process.uid == 0
|
||||||
Gem.default_dirs[:local][:bin_dir]
|
Gem.default_dirs[:local][:bin_dir]
|
||||||
|
|
|
@ -957,6 +957,7 @@ make check TESTS="-v $DISABLE_TESTS"
|
||||||
* Mon Feb 22 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.0-59
|
* Mon Feb 22 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.0-59
|
||||||
- Don't prefix bundling provides.
|
- Don't prefix bundling provides.
|
||||||
- Don't enable collections for build.
|
- Don't enable collections for build.
|
||||||
|
- Optimize operating_system.rb a bit.
|
||||||
|
|
||||||
* Fri Feb 19 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-58
|
* Fri Feb 19 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-58
|
||||||
- Fix default_dir and default_bindir
|
- Fix default_dir and default_bindir
|
||||||
|
|
Loading…
Reference in New Issue