14
0

Accepting request 711276 from home:dimstar:Factory

- Fixup pre script: the migration issue happens when changing from
  python-urllib3 to python2-urllib3: the number of installed
  instances of python2-urlliib3 is at this moment 1, unlike in
  regular updates. This is due to a name change, which consists not
  of a pure package update.

OBS-URL: https://build.opensuse.org/request/show/711276
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=76
This commit is contained in:
2019-06-21 07:47:01 +00:00
committed by Git OBS Bridge
parent e9f11af02d
commit e15cd57502
2 changed files with 17 additions and 10 deletions

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jun 21 06:23:36 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Fixup pre script: the migration issue happens when changing from
python-urllib3 to python2-urllib3: the number of installed
instances of python2-urlliib3 is at this moment 1, unlike in
regular updates. This is due to a name change, which consists not
of a pure package update.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 20 07:33:55 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> Thu Jun 20 07:33:55 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@@ -155,16 +155,14 @@ ln -s %{python3_sitelib}/rfc3986/ \
%if ! %{with test} %if ! %{with test}
%pre -n python2-urllib3 %pre -n python2-urllib3
SITELIB=%{python2_sitelib} SITELIB=%{python2_sitelib}
if [ "$1" -gt 1 ] ; then CONFLICTED="${SITELIB}/urllib3/packages/ssl_match_hostname"
CONFLICTED="${SITELIB}/urllib3/packages/ssl_match_hostname" if [ -d "$CONFLICTED" -a ! -L "$CONFLICTED" ] ; then
if [ -d "$CONFLICTED" -a ! -L "$CONFLICTED" ] ; then # Change from directory to symlink
# Change from directory to symlink rm -rfv "$CONFLICTED"
rm -rfv "$CONFLICTED" ln -s ../../backports/ssl_match_hostname \
ln -s ../../backports/ssl_match_hostname \ $CONFLICTED
$CONFLICTED fi
fi
fi
%endif %endif
%if %{with test} %if %{with test}