This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DLAB-1748 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d0899c4d965a5e7d5850fdaac5a19cc523332073 Author: leonidfrolov <frolovl...@gmail.com> AuthorDate: Thu Jul 9 10:04:54 2020 +0300 [DLAB-1748]: made dependencies a list --- infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +- infrastructure-provisioning/src/general/lib/os/fab.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py index 9558c7c..4d905e6 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py @@ -382,7 +382,7 @@ def install_os_pkg(requisites): '/tmp/os_install_{0}_dep.log; then echo "" > /tmp/os_install_{0}_dep.log;fi'.format(os_pkg, add_pkgs_parser)) err = sudo('cat /tmp/os_install_{}_err.log'.format(os_pkg)).replace('"', "'") dep = sudo('cat /tmp/os_install_{}_dep.log'.format(os_pkg)) - dep = dep[len(add_pkgs_parser):dep.find("Suggested packages:")].replace('\r', '').replace('\n', '').replace(' ', ' ').strip() + dep = dep[len(add_pkgs_parser):dep.find("Suggested packages:")].replace('\r', '').replace('\n', '').replace(' ', ' ').strip().split(' ') if dep == '': dep = "none" sudo('apt list --installed | if ! grep {0}/ > /tmp/os_install_{1}.list; then echo "" > /tmp/os_install_{1}.list;fi'.format(os_pkg.split("=")[0], os_pkg)) diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py index b800448..1020133 100644 --- a/infrastructure-provisioning/src/general/lib/os/fab.py +++ b/infrastructure-provisioning/src/general/lib/os/fab.py @@ -95,7 +95,7 @@ def install_pip_pkg(requisites, pip_version, lib_group): [i for i in ver if pip_pkg.split("=")[0].lower() in i][0].split( '==')[1] dep = sudo('{0} show {1} 2>&1 | grep "Requires: "'.format(pip_version, pip_pkg.split("=")[0])).replace( - '\r', '').replace('\n', '').replace('Requires: ', '').strip() + '\r', '').replace('\n', '').replace('Requires: ', '').strip().split(' ') status.append({"group": "{}".format(lib_group), "name": pip_pkg.split("=")[0], "version": version, "status": "installed", "add_pkgs": dep}) else: status.append({"group": "{}".format(lib_group), "name": pip_pkg.split("=")[0], "status": "failed", "error_message": err}) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org