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

Conversation

aitzkora
Copy link

@aitzkora aitzkora commented Aug 9, 2018

I'm not sure if my PR is sufficent, but I managed to install Conda with the new version 1.0.
i need to modify
isdefined for the macro @isdefined because the new version has two arguments
I replace also readstring by open(f->read(f,String)

two arguments, the first being the name of the module where the symbol
must be define
remove the deprecated readstring
@aitzkora
Copy link
Author

aitzkora commented Aug 9, 2018

Oh!
I did'not see you made ever the PR for the fix, forgot mine

@@ -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)

@@ -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

@stevengj
Copy link
Member

Duplicate of #113.

@stevengj stevengj closed this Aug 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants