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/14 12:04:07 UTC
[incubator-dlab] branch DLAB-1996 created (now 4b8443e)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1996
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 4b8443e [DLAB-1996]: fixed usage of pkg version during installation
This branch includes the following new commits:
new 782acb2 [DLAB-1996]: fixed python lib install failure
new 4b8443e [DLAB-1996]: fixed usage of pkg version during installation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1996]: fixed usage of pkg version
during installation
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1996
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4b8443e32acf36f2e6fff5186ab265222aad8b5b
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Aug 13 10:38:57 2020 +0300
[DLAB-1996]: fixed usage of pkg version during installation
---
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 a9a2fa9..835656e 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -410,7 +410,7 @@ def install_os_pkg(requisites):
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_{2}.log; then echo "" > /tmp/os_install_{2}.log;fi'.format(os_pkg.split("=")[0], error_parser, name))
+ '/tmp/os_install_{2}.log; then echo "" > /tmp/os_install_{2}.log;fi'.format(os_pkg, error_parser, name))
err = sudo('cat /tmp/os_install_{}.log'.format(name)).replace('"', "'")
sudo('cat /tmp/tee.tmp | if ! grep -w -E -A 30 "({1})" /tmp/tee.tmp > '
'/tmp/os_install_{0}.log; then echo "" > /tmp/os_install_{0}.log;fi'.format(name, new_pkgs_parser))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1996]: fixed python lib install
failure
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1996
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 782acb250d971562f7f0de56636edbf096e5adee
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Aug 13 10:36:41 2020 +0300
[DLAB-1996]: fixed python lib install failure
---
infrastructure-provisioning/src/general/lib/os/fab.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 6555f4b..508b2d2 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -76,7 +76,8 @@ def install_pip_pkg(requisites, pip_version, lib_group):
err = sudo('cat /tmp/{0}install_{1}.log'.format(pip_version, pip_pkg.split("==")[0])).replace('"', "'")
sudo('{0} freeze --all | if ! grep -w -i {1} > /tmp/{0}install_{1}.list; then echo "" > /tmp/{0}install_{1}.list;fi'.format(pip_version, name))
res = sudo('cat /tmp/{0}install_{1}.list'.format(pip_version, name))
- installed_out = sudo('cat /tmp/tee.tmp | grep "Successfully installed"')
+ sudo('cat /tmp/tee.tmp | if ! grep "Successfully installed" > /tmp/{0}install_{1}.list; then echo "" > /tmp/{0}install_{1}.list;fi'.format(pip_version, name))
+ installed_out = sudo('cat /tmp/{0}install_{1}.list'.format(pip_version, name))
changed_pip_pkg = False
if res == '':
changed_pip_pkg = pip_pkg.split("==")[0].replace("_", "-").split('-')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org