From c188b7dfb46d188b7c2f7f0a87e5f9a66cb85666 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Mon, 15 Jun 2015 10:47:57 -0400 Subject: Invoke PKIInstance.load() during upgrade Some upgrade servlets use attributes loaded when PKIInstance.load() is invoked, but it may not have been; breakage ensues. Invoke it before executing upgrade scriptlets. --- base/server/python/pki/server/upgrade.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'base/server/python/pki/server/upgrade.py') diff --git a/base/server/python/pki/server/upgrade.py b/base/server/python/pki/server/upgrade.py index db3d968aa..c9426a07c 100644 --- a/base/server/python/pki/server/upgrade.py +++ b/base/server/python/pki/server/upgrade.py @@ -184,6 +184,7 @@ class PKIServerUpgrader(pki.upgrade.PKIUpgrader): if self.instanceName and self.instanceType: instance = pki.server.PKIInstance(self.instanceName, self.instanceType) instance.validate() + instance.load() return [instance] instance_list = [] @@ -195,6 +196,7 @@ class PKIServerUpgrader(pki.upgrade.PKIUpgrader): self.instanceName == instanceName: instance = pki.server.PKIInstance(instanceName) instance.validate() + instance.load() instance_list.append(instance) if not self.instanceType or self.instanceType == 9: @@ -206,6 +208,7 @@ class PKIServerUpgrader(pki.upgrade.PKIUpgrader): self.instanceName == instanceName: instance = pki.server.PKIInstance(instanceName, 9) instance.validate() + instance.load() instance_list.append(instance) instance_list.sort() -- cgit