[devel] a fix for the upgrade of .egg-info wanted; was: Re: [#178494] DONE python-module-six.git=1.10.0-alt2
Ivan Zakharyaschev
imz на altlinux.org
Ср Фев 22 16:33:34 MSK 2017
Спасибо за помощь в добавлении подходящих Provides в пакет! Извините,
пожалуйста, что не среагировал на проблему так, как пообещал, т.е.
достаточно быстро.
Обнаружилась проблема обновления на новый пакет из-за того, что каким-то
неожиданным необъяснимым образом он пересобрался с файлом вместо
директории:
$ compare_packages -i -- python3-module-six-1.10.0-alt2.noarch.rpm
--- /tmp/.private/user/compare_packages.DmBmMaHkyW/1 2017-02-22 15:53:26.667710073 +0300
+++ /tmp/.private/user/compare_packages.DmBmMaHkyW/2 2017-02-22 15:53:26.664710067 +0300
@@ -2,11 +2,7 @@
-rw-r--r-- root root , /usr/lib/python3/site-packages/__pycache__/six.cpython-35.opt-1.pyc
-rw-r--r-- root root , /usr/lib/python3/site-packages/__pycache__/six.cpython-35.opt-2.pyc
-rw-r--r-- root root , /usr/lib/python3/site-packages/__pycache__/six.cpython-35.pyc
-drwxr-xr-x root root , /usr/lib/python3/site-packages/six-1.10.0-py3.5.egg-info
--rw-r--r-- root root , /usr/lib/python3/site-packages/six-1.10.0-py3.5.egg-info/PKG-INFO
--rw-r--r-- root root , /usr/lib/python3/site-packages/six-1.10.0-py3.5.egg-info/SOURCES.txt
--rw-r--r-- root root , /usr/lib/python3/site-packages/six-1.10.0-py3.5.egg-info/dependency_links.txt
--rw-r--r-- root root , /usr/lib/python3/site-packages/six-1.10.0-py3.5.egg-info/top_level.txt
+-rw-r--r-- root root , /usr/lib/python3/site-packages/six-1.10.0-py3.5.egg-info
-rw-r--r-- root root , /usr/lib/python3/site-packages/six.py
drwxr-xr-x root root , /usr/share/doc/python3-module-six-1.10.0
-rw-r--r-- root root , /usr/share/doc/python3-module-six-1.10.0/README
Что приводит к:
[root на prodesk0 ~]# rpm -q python3-module-six
python3-module-six-1.10.0-alt1.noarch
[root на prodesk0 ~]# rpm -Uv ~user/TO-TEST/python3-module-six-1.10.0-alt2.noarch.rpm
Preparing packages...
file /usr/lib/python3/site-packages/six-1.10.0-py3.5.egg-info from
install of python3-module-six-1.10.0-alt2.noarch conflicts with file from package python3-module-six-1.10.0-alt1.noarch
[root на prodesk0 ~]#
Какое-то недавнее питонье обновление приводит к таким тяжёлым последствиям
для Сизифа? Хорошо бы придумать объезд.
Изменения были простые:
$ git --no-pager diff 1.10.0-alt1..sisyphus
diff --git a/.gear/six.spec b/.gear/six.spec
index bf47339..f295724 100644
--- a/.gear/six.spec
+++ b/.gear/six.spec
@@ -1,10 +1,11 @@
%define oname six
+%def_without check
%def_with python3
Name: python-module-%oname
Version: 1.10.0
-Release: alt1
+Release: alt2
Summary: Python 2 and 3 compatibility utilities
License: MIT
Group: Development/Python
@@ -19,11 +20,13 @@ BuildPreReq: python-devel
# for test suite
%{?!_without_check:%{?!_disable_check:BuildRequires:
python-module-setuptools-tests}}
-
%if_with python3
BuildRequires(pre): rpm-build-python3
BuildRequires: python3-devel
%{?!_without_check:%{?!_disable_check:BuildRequires:
python3-module-setuptools-tests}}
+%py3_provides six.moves
+%py3_provides six.moves.urllib
+%py3_provides six.moves.urllib.parse
%endif
%description
@@ -90,6 +93,9 @@ popd
%endif
%changelog
+* Wed Feb 22 2017 Alexey Shabalin <shaba на altlinux.ru> 1.10.0-alt2
+- add python3 provides six.moves, six.moves.urllib,
six.moves.urllib.parse
+
* Tue Jan 03 2017 Anton Midyukov <antohami на altlinux.org> 1.10.0-alt1
- New version 1.10.0
Best regards,
Ivan
On Wed, 22 Feb 2017, Girar Builder pender robot wrote:
> http://git.altlinux.org/tasks/archive/done/_174/178494/logs/events.1.1.log
>
> 2017-Feb-22 12:22:47 :: task #178494 for sisyphus started by shaba:
> #100 build 1.10.0-alt2 from /people/shaba/packages/python-module-six.git
> 2017-Feb-22 12:22:48 :: [x86_64] #100 python-module-six.git 1.10.0-alt2: build start
> 2017-Feb-22 12:22:48 :: [i586] #100 python-module-six.git 1.10.0-alt2: build start
> 2017-Feb-22 12:23:44 :: [x86_64] #100 python-module-six.git 1.10.0-alt2: build OK
> 2017-Feb-22 12:23:44 :: [i586] #100 python-module-six.git 1.10.0-alt2: build OK
> 2017-Feb-22 12:23:49 :: build check OK
> 2017-Feb-22 12:23:49 :: noarch check OK
> 2017-Feb-22 12:23:50 :: plan: src +1 -1 =17829, noarch +2 -2 =17674
> 2017-Feb-22 12:23:50 :: version check OK
> 2017-Feb-22 12:24:53 :: generated apt indices
> 2017-Feb-22 12:24:53 :: created next repo
> 2017-Feb-22 12:25:20 :: dependencies check OK
> 2017-Feb-22 12:25:50 :: [i586] #100 python-module-six: install check OK
> 2017-Feb-22 12:25:51 :: [x86_64] #100 python-module-six: install check OK
> 2017-Feb-22 12:26:17 :: [i586] #100 python3-module-six: install check OK
> 2017-Feb-22 12:26:17 :: [x86_64] #100 python3-module-six: install check OK
> 2017-Feb-22 12:26:18 :: gears inheritance check OK
> 2017-Feb-22 12:26:18 :: srpm inheritance check OK
> girar-check-perms: access to python-module-six ALLOWED for shaba: project leader welcomes random builders
> 2017-Feb-22 12:26:18 :: acl check OK
> 2017-Feb-22 12:26:42 :: created contents_index files
> 2017-Feb-22 12:26:50 :: created hash files: noarch src
> 2017-Feb-22 12:26:53 :: task #178494 for sisyphus TESTED
> 2017-Feb-22 12:26:53 :: task is ready for commit
> 2017-Feb-22 12:27:07 :: repo clone OK
> 2017-Feb-22 12:27:07 :: packages update OK
> 2017-Feb-22 12:27:09 :: [noarch] update OK
> 2017-Feb-22 12:27:09 :: repo update OK
> 2017-Feb-22 12:27:18 :: repo save OK
> 2017-Feb-22 12:27:18 :: updated /gears/p/python-module-six.git branch `sisyphus'
> 2017-Feb-22 12:27:46 :: gears update OK
> 2017-Feb-22 12:27:46 :: task #178494 for sisyphus DONE
>
>
Подробная информация о списке рассылки Devel