Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 95a41f93cf90
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ed3dd5fe0123
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 27, 2018

  1. Require real path 

    expand load paths to real paths to get rid of duplicate loading from
symbolic-linked directories. [Feature #10222]
ruby/ruby@b6d3927

This fixes

test/mri/ruby/test_require.rb#test_symlink_load_path

Deletes obsolete spec/regression/GH-1940_symlink_load_path_should_not_expand_in_FILE_spec.rb

#5109 #5117
    @ChrisBr
    ChrisBr committed Mar 27, 2018
    Copy the full SHA
    1e1c11b View commit details

Commits on Apr 18, 2018

  1. Merge pull request #5121 from ChrisBr/bug/require-expanded 

    Require real path
    @headius
    headius authored Apr 18, 2018
    Copy the full SHA
    ed3dd5f View commit details
9 changes: 9 additions & 0 deletions core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
View file
Original file line number Diff line number Diff line change
@@ -167,6 +167,15 @@ private FoundLibrary findFileResourceWithLoadPath(String searchName, String suff
DebugLog.Resource.logTry(pathWithSuffix);
FileResource resource = JRubyFile.createResourceAsFile(runtime, pathWithSuffix);
if (resource.exists()) {
if (resource.absolutePath() != resource.canonicalPath()) {
FileResource expandedResource = JRubyFile.createResourceAsFile(runtime, resource.canonicalPath());
if (expandedResource.exists()){
resource = expandedResource;
String scriptName = resolveScriptName(resource, resource.canonicalPath());
String loadName = resolveLoadName(resource, searchName + suffix);
return new FoundLibrary(ResourceLibrary.create(searchName, scriptName, resource), loadName);
}
}
DebugLog.Resource.logFound(pathWithSuffix);
String scriptName = resolveScriptName(resource, pathWithSuffix);
String loadName = resolveLoadName(resource, searchName + suffix);
35 changes: 0 additions & 35 deletions spec/regression/GH-1940_symlink_load_path_should_not_expand_in_FILE_spec.rb
View file

This file was deleted.