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 81daea6 [DLAB-1594]: if failed to install, returns version N/A for apt and pip 81daea6 is described below commit 81daea642a951d52fc067238b7fd176e6f35ae02 Author: leonidfrolov <frolovl...@gmail.com> AuthorDate: Thu Jul 23 10:20:55 2020 +0300 [DLAB-1594]: if failed to install, returns version N/A for apt and pip --- 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 0a26b88..8708d08 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py @@ -375,7 +375,7 @@ def install_os_pkg(requisites): version = os_pkg[1] os_pkg = "{}={}".format(os_pkg[0], os_pkg[1]) else: - version = '' + version = 'N/A' os_pkg = os_pkg[0] sudo('DEBIAN_FRONTEND=noninteractive apt-get -y install --allow-downgrades {0} 2>&1 | tee /tmp/tee.tmp; if ! grep -w -E "({1})" /tmp/tee.tmp > ' '/tmp/os_install_{0}.log; then echo "" > /tmp/os_install_{0}.log;fi'.format(os_pkg, error_parser)) diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py index 8cc915c..1f41d10 100644 --- a/infrastructure-provisioning/src/general/lib/os/fab.py +++ b/infrastructure-provisioning/src/general/lib/os/fab.py @@ -64,7 +64,7 @@ def install_pip_pkg(requisites, pip_version, lib_group): for pip_pkg in requisites: if pip_pkg[1] == '' or pip_pkg[1] == 'N/A': pip_pkg = pip_pkg[0] - version = '' + version = 'N/A' else: version = pip_pkg[1] pip_pkg = "{}=={}".format(pip_pkg[0], pip_pkg[1]) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org