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/07/29 10:07:56 UTC

[incubator-dlab] branch DLAB-1966 updated: [DLAB-1966]: added removal of apt package from it`s dependencies list

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1966
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1966 by this push:
     new 554c79a  [DLAB-1966]: added removal of apt package from it`s dependencies list
554c79a is described below

commit 554c79a3c718178dc2f30d0b1edd8083481acc39
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jul 29 13:07:37 2020 +0300

    [DLAB-1966]: added removal of apt package from it`s dependencies list
---
 .../src/general/lib/os/debian/notebook_lib.py                      | 7 +++++--
 1 file changed, 5 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 7a9a12b..5e1b151 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -390,9 +390,12 @@ def install_os_pkg(requisites):
                         .replace('\n', '').replace('  ', ' ').replace(' {} '.format(os_pkg.split("=")[0]),
                                                                       ' ').strip().split(' ')
                 for n, i in enumerate(dep):
-                    sudo('apt show {0} 2>&1 | if ! grep Version: > '
+                    if i == os_pkg.split("=")[0]:
+                        dep[n] = ''
+                    else:
+                        sudo('apt show {0} 2>&1 | if ! grep Version: > '
                  '/tmp/os_install_{0}.log; then echo "" > /tmp/os_install_{0}.log;fi'.format(i))
-                    dep[n] =sudo('cat /tmp/os_install_{}.log'.format(i)).replace('Version: ', '{} v.'.format(i))
+                        dep[n] =sudo('cat /tmp/os_install_{}.log'.format(i)).replace('Version: ', '{} v.'.format(i))
                 dep = [i for i in dep if i]
             versions = []
             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))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org