From ea00ccf72747333d309dc9ea75a45e80405e4768 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 4 May 2016 09:03:16 -0700
Subject: [PATCH] pylint fixes
---
mx.fastr/mx_fastr.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 88c6038de1..296b1661b9 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -154,13 +154,15 @@ def _get_ldpaths(lib_env_name):
except subprocess.CalledProcessError:
mx.abort('error retrieving etc/ldpaths')
-def setREnvironment(env=os.environ):
+def setREnvironment(env=None):
'''
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.
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.
'''
+ if not env:
+ env = os.environ
# This may have been set by a higher power
if not 'R_HOME' in env:
env['R_HOME'] = _fastr_suite.dir
--
GitLab