This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1961
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1961 by this push:
new 46445d9 [DLAB-1961]: made changes for R package installation
46445d9 is described below
commit 46445d9a1c1400280eee9af3dbc9b647ce540ace
Author: leonidfrolov <frolovl...@gmail.com>
AuthorDate: Thu Jul 23 11:48:58 2020 +0300
[DLAB-1961]: made changes for R package installation
---
.../src/general/lib/os/fab.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py
b/infrastructure-provisioning/src/general/lib/os/fab.py
index 1f41d10..c6c1f53 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -88,7 +88,6 @@ def install_pip_pkg(requisites, pip_version, lib_group):
else:
version = \
[i for i in ver if pip_pkg.split("==")[0].lower() in
i][0].split('==')[1]
- if "==" in pip_pkg and pip_pkg.split("==")[1] == version or
True:
status_msg = "installed"
else:
status_msg = 'failed'
@@ -420,6 +419,7 @@ def install_r_pkg(requisites):
try:
for r_pkg in requisites:
name, vers = r_pkg
+ version = vers
if vers =='N/A':
vers = ''
else:
@@ -445,17 +445,17 @@ def install_r_pkg(requisites):
if res:
ansi_escape = re.compile(r'\x1b[^m]*m')
version = ansi_escape.sub('',
res).split("\r\n")[0].split('"')[1]
- status.append({"group": "r_pkg", "name": name, "version":
version, "status": "installed", "add_pkgs": dep})
+ status_msg = 'installed'
else:
- if 'Error in download_version_url(package, version, repos,
type) :' in err:
- sudo('R -e \'install.packages("versions",
repos="https://cloud.r-project.org";, dep=TRUE)\'')
- versions = sudo('R -e \'library(versions);
available.versions("' + name + '")\' 2>&1 | grep -A 50 '
+ status_msg = 'failed'
+ if 'Error in download_version_url(package, version, repos, type)
:' in err:
+ sudo('R -e \'install.packages("versions",
repos="https://cloud.r-project.org";, dep=TRUE)\'')
+ versions = sudo('R -e \'library(versions);
available.versions("' + name + '")\' 2>&1 | grep -A 50 '
'\'date available\' | awk \'{print
$2}\'').replace('\r\n', ' ')[5:].split(' ')
- status_msg = 'invalid version'
- else:
- versions = []
- status_msg = 'failed'
- status.append({"group": "r_pkg", "name": name, "status":
status_msg, "error_message": err, "available_versions": versions})
+ status_msg = 'invalid version'
+ else:
+ versions = []
+ status.append({"group": "r_pkg", "name": name, "version": version,
"status": status_msg, "error_message": err, "available_versions": versions,
"add_pkgs": dep})
return status
except Exception as err:
append_result("Failed to install R packages", str(err))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
