Skip to content

Commit

Permalink
Consistent nothing
Browse files Browse the repository at this point in the history
  • Loading branch information
musm committed Jan 28, 2017
1 parent 142681e commit a8e0c02
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/dependencies.jl
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ function _find_library(dep::LibraryDependency; provider = Any)
# Make sure we keep the defaults first, but also look in the other directories
providers = unique([reduce(vcat,[getallproviders(dep,p) for p in defaults]);dep.providers])
for (p,opts) in providers
(p != nothing && can_use(typeof(p)) && can_provide(p,opts,dep)) || continue
(p !== nothing && can_use(typeof(p)) && can_provide(p,opts,dep)) || continue
paths = AbstractString[]

# Allow user to override installation path
Expand Down Expand Up @@ -686,7 +686,7 @@ function viable_providers(deps::LibraryGroup)
continue
end
providers = map(x->typeof(x[1]),dep.providers)
if vp == nothing
if vp === nothing
vp = providers
else
vp = intersect(vp,providers)
Expand Down Expand Up @@ -1013,7 +1013,7 @@ macro load_dependencies(args...)
end
end)
end
if arg1 != nothing && !isa(arg1,Function)
if arg1 !== nothing && !isa(arg1,Function)
if !isempty(arg1)
errrormsg = "The following required libraries were not declared in build.jl:\n"
for k in (isa(arg1,Vector) ? arg1 : keys(arg1))
Expand Down

0 comments on commit a8e0c02

Please sign in to comment.