You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/08/10 13:57:42 UTC
[incubator-dlab] 02/05: [DLAB-1974]: fixed some bugs
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1974
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9aa747ee834771505683fdf4884736b5fd3b1df2
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Aug 10 10:56:42 2020 +0300
[DLAB-1974]: fixed some bugs
---
infrastructure-provisioning/src/general/lib/os/fab.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index b394671..a200a88 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -98,7 +98,7 @@ def install_pip_pkg(requisites, pip_version, lib_group):
versions = []
if 'Could not find a version that satisfies the requirement' in err:
versions = err[err.find("(from versions: ") + 16: err.find(")\r\n")]
- if versions != '':
+ if versions != '' and versions != 'none':
versions = versions.split(', ')
status_msg = 'invalid_version'
else:
@@ -447,8 +447,8 @@ def install_r_pkg(requisites):
else:
sudo('R -e \'devtools::install_version("{0}", version = {1}, repos = "https://cloud.r-project.org", dep=TRUE)\' 2>&1 | '
'tee /tmp/tee.tmp; if ! grep -w -E "({2})" /tmp/tee.tmp > /tmp/install_{0}.log; then echo "" > /tmp/install_{0}.log;fi'.format(name, vers, error_parser))
- dep = sudo('grep "(NA" /tmp/tee.tmp | awk \'{print $1}\'').replace('\r\n', ' ')
- dep_ver = sudo('grep "(NA" /tmp/tee.tmp | awk \'{print $4}\'').replace('\r\n', ' ').replace(')', '').split(' ')
+ dep = sudo('grep "(NA.*->". /tmp/tee.tmp | awk \'{print $1}\'').replace('\r\n', ' ')
+ dep_ver = sudo('grep "(NA.*->". /tmp/tee.tmp | awk \'{print $4}\'').replace('\r\n', ' ').replace(')', '').split(' ')
if dep == '':
dep = []
else:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org