Univention Bugzilla – Bug 49176
Migrate services/univention-s4-connector to dh_python2
Last modified: 2019-06-03 14:56:44 CEST
The package services/univention-s4-connector should be migrated to use dh_python instead of python-support. Migration-Guide: https://hutten.knut.univention.de/mediawiki/index.php/Python_DebHelper_Migration
Depends on: base/univention-lib/python/admember.py:if sys.path[0] == '/usr/share/pyshared/univention/s4connector/s4':
test/ucs-test/tests/52_s4connector/002_multiple_s4_connector_instances:pgrep -f "/usr/bin/python2.7 -W ignore /usr/lib/pymodules/python2.7/univention/s4connector/s4/main.py" || fail_test 1 test/ucs-test/tests/52_s4connector/002_multiple_s4_connector_instances:/usr/bin/python2.7 -W ignore /usr/lib/pymodules/python2.7/univention/s4connector/s4/main.py && fail_test 110 test/ucs-test/tests/52_s4connector/002_multiple_s4_connector_instances:» pkill -f "/usr/bin/python2.7 -W ignore /usr/lib/pymodules/python2.7/univention/s4connector/s4/main.py"
Added a branch with a basis: dh-python/49176-univention-s4-connector It blocks that in univention.lib.admember we can fix the absolute import of "dns" because the s4 connector is started as script with "python /usr/lib/pymodules/python2.7/univention/s4connector/s4/main.py" instead of e.g. "/usr/bin/python2.7 -W ignore -m univention.s4connector.s4.main". sed -i 's#/usr/share/pyshared/univention/#/usr/lib/python2.7/dist-packages/univention/#g' test/ucs-test/tests/52_s4connector/* sed -i 's#^sed -i "s/import mapping/import mapping\\n#sed -i "/^mapping = imp.*/a #g' test/ucs-test/tests/52_s4connector/* Depends on: nagios/univention-nagios-s4-connector/check_univention_s4_connector:/usr/lib/nagios/plugins/check_procs -w :1 -c 1: --ereg-argument-array "python.*s4connector/s4/main.py\$" >/dev/null 2>&1 Depends on Bug #49147: 97univention-s4-connector.inst:» --udm_module /usr/share/pyshared/univention/admin/handlers/container/msgpo.py || die 97univention-s4-connector.inst:» --udm_module /usr/share/pyshared/univention/admin/handlers/settings/mswmifilter.py || die 97univention-s4-connector.inst:» --udm_module /usr/share/pyshared/univention/admin/handlers/settings/msprintconnectionpolicy.py || die
The branch has been merged except for the commit in univention-lib (so it doesn't block any releasing). univention-nagios-s4-connector (4.0.1-2) 5a95d80e2f75 | Bug #49176: Merge branch 'dh-python/49176-univention-s4-connector' into 4.4-0 483ae54fcf28 | YAML Bug #49176 univention-s4-connector (13.0.2-9) 5a95d80e2f75 | Bug #49176: Merge branch 'dh-python/49176-univention-s4-connector' into 4.4-0 483ae54fcf28 | YAML Bug #49176 univention-nagios-s4-connector (4.0.1-1) 76f15e26e04d | Bug #49176: detect running univention-s4-connector service more graceful and strict univention-s4-connector (13.0.2-8) e13c712b7448 | Bug #49176: futurize -nw --no-diffs -f lib2to3.fixes.fix_numliterals modules/ 645184ffddd4 | Bug #49176: futurize -nw --no-diffs -f lib2to3.fixes.fix_long modules/ 6fe611c8cd9b | Bug #49176: futurize -nw --no-diffs -f lib2to3.fixes.fix_except modules/ a3e36dcabfd5 | Bug #49176: futurize -nw --no-diffs -f libfuturize.fixes.fix_print_with_import modules/ 21bf24c4d723 | Bug #49176: ensure backwards compatibility for nagios plugin check 42163b09f0e8 | Bug #49176: Add python3-univention-connector-s4 package 07bc77c71591 | Bug #49176: Migrate package to dh_python2 de6ab0b40185 | Bug #49176: fix programs definition of s4 connector service 63152b8130b4 | Bug #49176: do not adjust sys.path for importing of mapping.py ucs-test (9.0.2-60) eb60c53fd566 | Bug #49176: adjust test cases for new s4 connector path univention-config-registry (14.0.0-4) 3f025f0856ef | Bug #49176: Enhance detection of services 5a95d80e2f75 | Bug #49176: Merge branch 'dh-python/49176-univention-s4-connector' into 4.4-0 483ae54fcf28 | YAML Bug #49176
# LANG=C apt install -s python-univention-connector-s4 ... The following packages have unmet dependencies: python-univention-connector-s4 : Depends: python-setproctitle but it is not installable
(In reply to Philipp Hahn from comment #5) > # LANG=C apt install -s python-univention-connector-s4 > ... > The following packages have unmet dependencies: > python-univention-connector-s4 : Depends: python-setproctitle but it is not > installable Oh, it is unmaintained. Thanks. Fixed via: https://hutten.knut.univention.de/mediawiki/index.php/Errata-Updates#Ein_Paket_nach_maintained_.C3.BCbernehmen fbest@omar: /mnt/build-storage/buildsystem/apt/ucs_4.4-0-errata4.4-0 10:17:41(0 J0 !901 #6)$ /home/phahn/bin/repo-copy-dsc -vvvv ../ucs_4.3-0/source/python-setproctitle_1.1.10-1.dsc 2019-05-22 10:17:49,781 INFO:dsc:Processing ../ucs_4.3-0/source/python-setproctitle_1.1.10-1.dsc... 2019-05-22 10:17:49,784 INFO:ln: ../ucs_4.3-0/source/python-setproctitle_1.1.10-1.dsc -> source/python-setproctitle_1.1.10-1.dsc 2019-05-22 10:17:49,784 INFO:ln: ../ucs_4.3-0/source/python-setproctitle_1.1.10.orig.tar.gz -> source/python-setproctitle_1.1.10.orig.tar.gz 2019-05-22 10:17:49,784 INFO:ln: ../ucs_4.3-0/source/python-setproctitle_1.1.10-1.debian.tar.xz -> source/python-setproctitle_1.1.10-1.debian.tar.xz 2019-05-22 10:17:50,031 INFO:ln: ../ucs_4.3-0/i386/python-setproctitle_1.1.10-1_i386.deb -> i386/python-setproctitle_1.1.10-1_i386.deb 2019-05-22 10:17:50,213 INFO:ln: ../ucs_4.3-0/amd64/python-setproctitle_1.1.10-1_amd64.deb -> amd64/python-setproctitle_1.1.10-1_amd64.deb 2019-05-22 10:17:50,305 INFO:ln: ../ucs_4.3-0/i386/python-setproctitle-dbg_1.1.10-1_i386.deb -> i386/python-setproctitle-dbg_1.1.10-1_i386.deb 2019-05-22 10:17:50,446 INFO:ln: ../ucs_4.3-0/amd64/python-setproctitle-dbg_1.1.10-1_amd64.deb -> amd64/python-setproctitle-dbg_1.1.10-1_amd64.deb 2019-05-22 10:17:50,561 INFO:ln: ../ucs_4.3-0/i386/python3-setproctitle_1.1.10-1_i386.deb -> i386/python3-setproctitle_1.1.10-1_i386.deb 2019-05-22 10:17:50,650 INFO:ln: ../ucs_4.3-0/amd64/python3-setproctitle_1.1.10-1_amd64.deb -> amd64/python3-setproctitle_1.1.10-1_amd64.deb 2019-05-22 10:17:50,770 INFO:ln: ../ucs_4.3-0/i386/python3-setproctitle-dbg_1.1.10-1_i386.deb -> i386/python3-setproctitle-dbg_1.1.10-1_i386.deb 2019-05-22 10:17:50,968 INFO:ln: ../ucs_4.3-0/amd64/python3-setproctitle-dbg_1.1.10-1_amd64.deb -> amd64/python3-setproctitle-dbg_1.1.10-1_amd64.deb fbest@omar: /mnt/build-storage/buildsystem/apt/ucs_4.4-0-errata4.4-0 10:17:50(0 J0 !902 #7)$ repo-apt-ftparchive --release ${PWD##*/} Updating Packages/Sources files for ucs_4.4-0-errata4.4-0/all using /var/univention/buildsystem2/override/ucs_4.4 The folder extern does not exists Updating Packages/Sources files for ucs_4.4-0-errata4.4-0/amd64 using /var/univention/buildsystem2/override/ucs_4.4 Updating Packages/Sources files for ucs_4.4-0-errata4.4-0/i386 using /var/univention/buildsystem2/override/ucs_4.4 Updating Packages/Sources files for ucs_4.4-0-errata4.4-0/source using /var/univention/buildsystem2/override/ucs_4.4 …
Also merged the changes for univention-lib: univention-lib (8.0.1-18) 2141945e43dc | Bug #49176: fix absolute import of dns module
Ok.
Reopen, wrong bug.
Verified: * Code review * Package update and nagios check * Jenkins test status * Advsiroy 0967027189 | minor advisory fixes.
<http://errata.software-univention.de/ucs/4.4/116.html> <http://errata.software-univention.de/ucs/4.4/119.html> <http://errata.software-univention.de/ucs/4.4/125.html> <http://errata.software-univention.de/ucs/4.4/126.html> <http://errata.software-univention.de/ucs/4.4/130.html>