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
This commit is contained in:
parent
ae664dd2f3
commit
6effdf370a
@ -89,17 +89,10 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if is_suse; then
|
if is_suse; then
|
||||||
# novnc has an extraneous dependency on pyOpenSSL, which causes symbol conflicts
|
|
||||||
# in the bundled libssl of python-cryptography. when both are loaded into the same
|
|
||||||
# process, they start hanging or segfaulting.
|
|
||||||
install_package novnc
|
|
||||||
# deinstall the extra but irrelevant dependencies
|
|
||||||
sudo rpm -e --nodeps python-cffi python-cryptography python-pyOpenSSL
|
|
||||||
# reinstall cffi which got overwriten by the package.
|
|
||||||
sudo pip install -I cffi
|
|
||||||
# now reinstall cryptography from source, in order to rebuilt it against the
|
# now reinstall cryptography from source, in order to rebuilt it against the
|
||||||
# system libssl rather than the bundled openSSL 1.1, which segfaults when combined
|
# system libssl rather than the bundled openSSL 1.1, which segfaults when combined
|
||||||
# with the system provided (which libpython links against) openSSL 1.0
|
# with a system provided openSSL 1.0
|
||||||
|
# see https://github.com/pyca/cryptography/issues/3804 and followup issues
|
||||||
sudo pip install cryptography --no-binary :all:
|
sudo pip install cryptography --no-binary :all:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user