Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QueryR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Lopez
QueryR
Commits
ea00ccf7
Commit
ea00ccf7
authored
8 years ago
by
Mick Jordan
Browse files
Options
Downloads
Patches
Plain Diff
pylint fixes
parent
63fa05ee
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mx.fastr/mx_fastr.py
+3
-1
3 additions, 1 deletion
mx.fastr/mx_fastr.py
with
3 additions
and
1 deletion
mx.fastr/mx_fastr.py
+
3
−
1
View file @
ea00ccf7
...
@@ -154,13 +154,15 @@ def _get_ldpaths(lib_env_name):
...
@@ -154,13 +154,15 @@ def _get_ldpaths(lib_env_name):
except
subprocess
.
CalledProcessError
:
except
subprocess
.
CalledProcessError
:
mx
.
abort
(
'
error retrieving etc/ldpaths
'
)
mx
.
abort
(
'
error retrieving etc/ldpaths
'
)
def
setREnvironment
(
env
=
os
.
envir
on
):
def
setREnvironment
(
env
=
N
on
e
):
'''
'''
If R is run via mx, then the library path will not be set, whereas if it is
If R is run via mx, then the library path will not be set, whereas if it is
run from
'
bin/R
'
it will be, via etc/ldpaths.
run from
'
bin/R
'
it will be, via etc/ldpaths.
On Mac OS X El Capitan and beyond, this is moot as the variable is not
On Mac OS X El Capitan and beyond, this is moot as the variable is not
passed down. It is TBD if we can avoid this on Linux.
passed down. It is TBD if we can avoid this on Linux.
'''
'''
if
not
env
:
env
=
os
.
environ
# This may have been set by a higher power
# This may have been set by a higher power
if
not
'
R_HOME
'
in
env
:
if
not
'
R_HOME
'
in
env
:
env
[
'
R_HOME
'
]
=
_fastr_suite
.
dir
env
[
'
R_HOME
'
]
=
_fastr_suite
.
dir
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment