[Pkg-freeipa-devel] [Git][freeipa-team/freeipa][master-next] 2 commits: {server, client}.postinst: Migrate checks to python3.

[Timo Aaltonen]

Timo Aaltonen pushed to branch master-next at FreeIPA packaging / freeipa


Commits:
c5a8d7ce by Timo Aaltonen at 2019-09-08T20:58:20Z
{server,client}.postinst: Migrate checks to python3.

- - - - -
cebc309b by Timo Aaltonen at 2019-09-08T21:46:13Z
control: Add python3-pki-base to python3-ipaserver depends.

- - - - -


4 changed files:

- debian/changelog
- debian/control.server
- debian/freeipa-client.postinst
- debian/freeipa-server.postinst


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+freeipa (4.8.1-2) UNRELEASED; urgency=medium
+
+  * {server,client}.postinst: Migrate checks to python3.
+  * control: Add python3-pki-base to python3-ipaserver depends.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Sun, 08 Sep 2019 23:58:09 +0300
+
 freeipa (4.8.1-1) experimental; urgency=medium
 
   * New upstream release.


=====================================
debian/control.server
=====================================
@@ -136,6 +136,7 @@ Depends:
  python3-kdcproxy,
  python3-ldap (>= 2.4.22),
  python3-libsss-nss-idmap,
+ python3-pki-base,
  python3-pyasn1,
  python3-sss,
  samba-common,


=====================================
debian/freeipa-client.postinst
=====================================
@@ -5,7 +5,7 @@ LOGFILE=/var/log/ipaclient-upgrade.log
 
 if [ "$1" = configure ]; then
     if [ -f /etc/ipa/nssdb/cert8.db ]; then
-        python2 -c 'from ipaclient.install.client import update_ipa_nssdb; update_ipa_nssdb()' \
+        python3 -c 'from ipaclient.install.client import update_ipa_nssdb; update_ipa_nssdb()' \
         > $LOGFILE 2>&1
     fi
 fi


=====================================
debian/freeipa-server.postinst
=====================================
@@ -94,8 +94,8 @@ if [ "$1" = configure ]; then
     fi
 
     # check if IPA is set up
-    is_configured=`python2 -c 'from ipaserver.install import installutils; print "yes" if installutils.is_ipa_configured() else "no";'`
-    if [ $is_configured = yes ]; then
+    is_configured=`python3 -c 'import sys; from ipaserver.install import installutils; sys.exit(0 if installutils.is_ipa_configured() else 1);'`
+    if [ $is_configured ]; then
         echo "Running ipa-server-upgrade..."
         ipa-server-upgrade --quiet >/dev/null
     fi



View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/compare/1d34124924799578f175692ff5a61f03e87d4ecb...cebc309bed6ecb003920b0f5b446fc5f3dfb7da2

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/compare/1d34124924799578f175692ff5a61f03e87d4ecb...cebc309bed6ecb003920b0f5b446fc5f3dfb7da2
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20190908/16dd7691/attachment-0001.html>