Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change isdefined for @isdefined because the new function isdefined needs #114

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ module DefaultDeps
if isfile("deps.jl")
include("deps.jl")
end
if !isdefined(:ROOTENV)
if !@isdefined(ROOTENV)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break Julia 0.6. Maybe change it to !isdefined(@__MODULE__, :ROOTENV)

const ROOTENV = abspath(dirname(@__FILE__), "usr")
end
if !isdefined(:MINICONDA_VERSION)
if !@isdefined(MINICONDA_VERSION)
const MINICONDA_VERSION = "3"
end
end
Expand All @@ -32,7 +32,7 @@ const ROOTENV = "$(escape_string(ROOTENV))"
const MINICONDA_VERSION = "$(escape_string(MINICONDA_VERSION))"
"""

if !isfile("deps.jl") || readstring("deps.jl") != deps
if !isfile("deps.jl") || open(f->read(f,String),"deps.jl") != deps
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

read("deps.jl", String) should work

write("deps.jl", deps)
end

Expand Down