Browse code

Remove extra websockify dependency cleanup step

This started to fail due to a missing || : / --force option now
that the dependencies got fixed:

2017-07-30 19:38:37.260 | ++ tools/install_prereqs.sh:source:97 : sudo rpm -e --nodeps python-cffi python-cryptography python-pyOpenSSL
2017-07-30 19:38:37.293 | error: package python-cffi is not installed
2017-07-30 19:38:37.293 | error: package python-cryptography is not installed
2017-07-30 19:38:37.293 | error: package python-pyOpenSSL is not installed

Change-Id: Ia59afb7ee564cf2044ebdb3c5ad3e54ee91d1222

Dirk Mueller authored on 2017/07/28 03:28:43
Showing 1 changed files
... ...
@@ -89,17 +89,10 @@ else
89 89
 fi
90 90
 
91 91
 if is_suse; then
92
-    # novnc has an extraneous dependency on pyOpenSSL, which causes symbol conflicts
93
-    # in the bundled libssl of python-cryptography. when both are loaded into the same
94
-    # process, they start hanging or segfaulting.
95
-    install_package novnc
96
-    # deinstall the extra but irrelevant dependencies
97
-    sudo rpm -e --nodeps python-cffi python-cryptography python-pyOpenSSL
98
-    # reinstall cffi which got overwriten by the package.
99
-    sudo pip install -I cffi
100 92
     # now reinstall cryptography from source, in order to rebuilt it against the
101 93
     # system libssl rather than the bundled openSSL 1.1, which segfaults when combined
102
-    # with the system provided (which libpython links against) openSSL 1.0
94
+    # with a system provided openSSL 1.0
95
+    # see https://github.com/pyca/cryptography/issues/3804 and followup issues
103 96
     sudo pip install cryptography --no-binary :all:
104 97
 fi
105 98