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
The following commit(s) were added to refs/heads/DLAB-1748 by this push:
new 0001a8f [DLAB-1748]: changed apt and pip dependencies list
0001a8f is described below
commit 0001a8ff9163c50c7292a4df852142c9ac75c323
Author: leonidfrolov <frolovl...@gmail.com>
AuthorDate: Fri Jul 17 15:18:29 2020 +0300
[DLAB-1748]: changed apt and pip dependencies list
---
.../src/general/lib/os/debian/notebook_lib.py | 7 ++++++-
infrastructure-provisioning/src/general/lib/os/fab.py | 4 +++-
2 files changed, 9 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 7d2b2a7..18d7f59 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -389,8 +389,13 @@ def install_os_pkg(requisites):
else:
for n, i in enumerate(dep):
pkg = sudo('apt list --installed 2>&1 | grep
{}'.format(i))
- if "/" in pkg:
+ if pkg == '':
+ pkg = sudo('apt list --installed 2>&1 | grep
{}'.format(i.lower()))
+ if i == os_pkg.split("=")[0]:
+ dep[n] = ''
+ elif "/" in pkg:
dep[n] = '{} v.{}'.format(pkg.split('/')[0],
pkg.split(' ')[1])
+ dep = [i for i in dep if i]
else:
dep = []
if 'E: Version' in err and 'was not found' in err:
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py
b/infrastructure-provisioning/src/general/lib/os/fab.py
index ede6a24..4505cf0 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -97,7 +97,9 @@ def install_pip_pkg(requisites, pip_version, lib_group):
if i == pip_pkg.split("==")[0]:
dep[n] = ''
else:
- dep[n] = sudo('{} freeze 2>&1 | grep -i
"{}=="'.format(pip_version , i)).replace('==', ' v.')
+ dep[n] = sudo('{} freeze 2>&1 | grep
{}=='.format(pip_version , i)).replace('==', ' v.')
+ if dep[n] == '':
+ dep[n] = sudo('{} freeze 2>&1 | grep
{}=='.format(pip_version, i.lower())).replace('==', ' v.')
dep = [i for i in dep if i]
status.append({"group": "{}".format(lib_group), "name":
pip_pkg.split("==")[0], "version": version, "status": "installed", "add_pkgs":
dep})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
