From c7b3fb0668e7732e8d97a8ab1e82a9e8527c21dc Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 21 Mar 2018 16:08:55 +0200 Subject: [PATCH] Fix missing import in the upgrade patch --- ...configuration-upgrade-under-empty-ccache.patch | 15 ++++++++------- freeipa.spec | 5 ++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/0003-upgrade-Run-configuration-upgrade-under-empty-ccache.patch b/0003-upgrade-Run-configuration-upgrade-under-empty-ccache.patch index 57b003d..f38f289 100644 --- a/0003-upgrade-Run-configuration-upgrade-under-empty-ccache.patch +++ b/0003-upgrade-Run-configuration-upgrade-under-empty-ccache.patch @@ -1,4 +1,4 @@ -From fa7b54356d9b8c0d7b3b5788f527ef3eecdf58b8 Mon Sep 17 00:00:00 2001 +From cd81ffbd7b9657e6715e3dc1b69bd9499036675b Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 21 Mar 2018 10:33:32 +0200 Subject: [PATCH] upgrade: Run configuration upgrade under empty ccache @@ -13,22 +13,23 @@ default ccache and if that's not available, kadmin.local will fail. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1558818 Signed-off-by: Alexander Bokovoy --- - ipaserver/install/server/upgrade.py | 28 +++++++++++++++++++++++++++- - 1 file changed, 27 insertions(+), 1 deletion(-) + ipaserver/install/server/upgrade.py | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py -index a38f4115c..5212a2749 100644 +index a38f4115c..4844350dc 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py -@@ -11,6 +11,7 @@ import shutil +@@ -11,6 +11,8 @@ import shutil import pwd import fileinput import sys ++import tempfile +from contextlib import contextmanager from augeas import Augeas import dns.exception from ipalib import api, x509 -@@ -1926,6 +1927,30 @@ def upgrade_check(options): +@@ -1926,6 +1928,30 @@ def upgrade_check(options): logger.warning("Upgrade without version check may break your system") @@ -59,7 +60,7 @@ index a38f4115c..5212a2749 100644 def upgrade(): realm = api.env.realm schema_files = [os.path.join(paths.USR_SHARE_IPA_DIR, f) for f -@@ -1950,7 +1975,8 @@ def upgrade(): +@@ -1950,7 +1976,8 @@ def upgrade(): print('Upgrading IPA services') logger.info('Upgrading the configuration of the IPA services') diff --git a/freeipa.spec b/freeipa.spec index 10a8243..d8abf10 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -100,7 +100,7 @@ Name: freeipa Version: %{VERSION} -Release: 6%{?dist} +Release: 6.1%{?dist} Summary: The Identity, Policy and Audit system Group: System Environment/Base @@ -1720,6 +1720,9 @@ fi %endif # with_ipatests %changelog +* Wed Mar 21 2018 Alexander Bokovoy - 4.6.90.pre1-6.1 +- Change upgrade code to use DIR-based ccache and no kinit (#1558818) + * Wed Mar 21 2018 Alexander Bokovoy - 4.6.90.pre1-6 - Change upgrade code to use DIR-based ccache and no kinit (#1558818)