From 3ce8ed6d96f23d7a54c2b9af7aac70cfb72f0239 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Mon, 29 Apr 2013 21:42:01 -0400 Subject: Restored /etc/pki/pki.conf. The /etc/pki/pki.conf has been restored. The RPM spec file has been modified such that it will create system upgrade tracker file (/etc/pki/pki.version) on install and remove it on uninstall. --- base/common/python/pki/upgrade.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'base/common/python') diff --git a/base/common/python/pki/upgrade.py b/base/common/python/pki/upgrade.py index dd4ffe8a2..3be5025b2 100644 --- a/base/common/python/pki/upgrade.py +++ b/base/common/python/pki/upgrade.py @@ -30,7 +30,7 @@ import pki DEFAULT_VERSION = '10.0.0' UPGRADE_DIR = pki.SHARE_DIR + '/upgrade' -SYSTEM_TRACKER = pki.CONF_DIR + '/pki.conf' +SYSTEM_TRACKER = pki.CONF_DIR + '/pki.version' verbose = False @@ -412,8 +412,9 @@ class PKIUpgrader(object): else: tracker = PKIUpgradeTracker('system', SYSTEM_TRACKER, - version_key='PKI_VERSION', - index_key='PKI_UPGRADE_INDEX') + delimiter=': ', + version_key='Configuration-Version', + index_key='Scriptlet-Index') self.system_tracker = tracker return tracker -- cgit