Merge branch 'master' of github.com:JuliaLang/julia

mlhetland · Jul 30, 2015 · 322d4c8 · 322d4c8
2 parents 83f92ef + d2ec61d
commit 322d4c8
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/base/loading.jl b/base/loading.jl
@@ -7,14 +7,13 @@
 function find_in_path(name::AbstractString, wd = pwd())
     isabspath(name) && return name
     if wd === nothing; wd = pwd(); end
-    isfile(joinpath(wd,name)) && return joinpath(wd,name)
     base = name
     if endswith(name,".jl")
         base = name[1:end-3]
     else
         name = string(base,".jl")
-        isfile(joinpath(wd,name)) && return joinpath(wd,name)
     end
+    isfile(joinpath(wd,name)) && return joinpath(wd,name)
     for prefix in [Pkg.dir(); LOAD_PATH]
         path = joinpath(prefix, name)
         isfile(path) && return abspath(path)