summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/upgrade.py
diff options
context:
space:
mode:
authorFraser Tweedale <frase@frase.id.au>2015-06-15 10:47:57 -0400
committerFraser Tweedale <frase@frase.id.au>2015-06-16 01:38:06 -0400
commitc188b7dfb46d188b7c2f7f0a87e5f9a66cb85666 (patch)
treede0ba570d1a8a0968e814474155644f535614495 /base/server/python/pki/server/upgrade.py
parent21913d2c91bcc7d9b0d63acf7effaf2ba7b6d7e5 (diff)
downloadpki-c188b7dfb46d188b7c2f7f0a87e5f9a66cb85666.tar.gz
pki-c188b7dfb46d188b7c2f7f0a87e5f9a66cb85666.tar.xz
pki-c188b7dfb46d188b7c2f7f0a87e5f9a66cb85666.zip
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.
Diffstat (limited to 'base/server/python/pki/server/upgrade.py')
-rw-r--r--base/server/python/pki/server/upgrade.py3
1 files changed, 3 insertions, 0 deletions
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()