Accepting request 710979 from home:mcepl:branches:devel:languages:python

Fix for bsc#1138715

OBS-URL: https://build.opensuse.org/request/show/710979
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=70
This commit is contained in:
Matej Cepl 2019-06-19 22:40:14 +00:00 committed by Git OBS Bridge
parent d9ccae276f
commit 2942de9f59
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 20 00:30:19 CEST 2019 - Matej Cepl <mcepl@suse.com>
- bsc#1138715: Add precaution when on upgrade there is
conflicting ssl_match_hostname directory.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 7 11:40:05 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> Fri Jun 7 11:40:05 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -151,6 +151,13 @@ ln -s %{python3_sitelib}/rfc3986/ \
%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_expand %fdupes %{buildroot}%{$python_sitelib}
%endif %endif
# There is a possible conflict with older version of the package
%pre
CONFLICTED="%{python3_sitelib}/urllib3/packages/ssl_match_hostname"
if [ "$1" -gt 1 ] && [ -d "$CONFLICTED" ] ; then
rm -rf $CONFLICTED
fi
%check %check
%if %{with test} %if %{with test}
skiplist='not test_select_interrupt_exception and not test_selector_error and not timeout and not test_request_host_header_ignores_fqdn_dot and not test_dotted_fqdn and not TestImportWithoutSSL' skiplist='not test_select_interrupt_exception and not test_selector_error and not timeout and not test_request_host_header_ignores_fqdn_dot and not test_dotted_fqdn and not TestImportWithoutSSL'