rpms/ipa
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix missing import in the upgrade patch

Browse Source
This commit is contained in:
Alexander Bokovoy 2018-03-21 16:08:55 +02:00
parent 445afe77e5
commit c7b3fb0668
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
0003-upgrade-Run-configuration-upgrade-under-empty-ccache.patch
View File

@ -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 <abokovoy@redhat.com> From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Wed, 21 Mar 2018 10:33:32 +0200 Date: Wed, 21 Mar 2018 10:33:32 +0200
Subject: [PATCH] upgrade: Run configuration upgrade under empty ccache 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 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1558818
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com> Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
--- ---
ipaserver/install/server/upgrade.py | 28 +++++++++++++++++++++++++++- ipaserver/install/server/upgrade.py | 29 ++++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-) 1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py 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 --- a/ipaserver/install/server/upgrade.py
+++ b/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 pwd
import fileinput import fileinput
import sys import sys
+import tempfile
+from contextlib import contextmanager +from contextlib import contextmanager
from augeas import Augeas from augeas import Augeas
import dns.exception import dns.exception
from ipalib import api, x509 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") logger.warning("Upgrade without version check may break your system")
@ -59,7 +60,7 @@ index a38f4115c..5212a2749 100644
def upgrade(): def upgrade():
realm = api.env.realm realm = api.env.realm
schema_files = [os.path.join(paths.USR_SHARE_IPA_DIR, f) for f 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') print('Upgrading IPA services')
logger.info('Upgrading the configuration of the IPA services') logger.info('Upgrading the configuration of the IPA services')

5
freeipa.spec
View File

@ -100,7 +100,7 @@
Name: freeipa Name: freeipa
Version: %{VERSION} Version: %{VERSION}
Release: 6%{?dist} Release: 6.1%{?dist}
Summary: The Identity, Policy and Audit system Summary: The Identity, Policy and Audit system
Group: System Environment/Base Group: System Environment/Base
@ -1720,6 +1720,9 @@ fi
%endif # with_ipatests %endif # with_ipatests
%changelog %changelog
* Wed Mar 21 2018 Alexander Bokovoy <abokovoy@redhat.com> - 4.6.90.pre1-6.1
- Change upgrade code to use DIR-based ccache and no kinit (#1558818)
* Wed Mar 21 2018 Alexander Bokovoy <abokovoy@redhat.com> - 4.6.90.pre1-6 * Wed Mar 21 2018 Alexander Bokovoy <abokovoy@redhat.com> - 4.6.90.pre1-6
- Change upgrade code to use DIR-based ccache and no kinit (#1558818) - Change upgrade code to use DIR-based ccache and no kinit (#1558818)