diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2013-04-29 21:42:01 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-04-30 00:27:03 -0400 |
| commit | 3ce8ed6d96f23d7a54c2b9af7aac70cfb72f0239 (patch) | |
| tree | d9eab5545529229fb87fcfe358e1482b1db98997 /base | |
| parent | e63ac5aade9c5a35f5fd49da5b2beb54d6be8523 (diff) | |
| download | pki-3ce8ed6d96f23d7a54c2b9af7aac70cfb72f0239.tar.gz pki-3ce8ed6d96f23d7a54c2b9af7aac70cfb72f0239.tar.xz pki-3ce8ed6d96f23d7a54c2b9af7aac70cfb72f0239.zip | |
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.
Diffstat (limited to 'base')
| -rw-r--r-- | base/common/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | base/common/python/pki/upgrade.py | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt index e23e5c5f4..efdec85c4 100644 --- a/base/common/CMakeLists.txt +++ b/base/common/CMakeLists.txt @@ -13,6 +13,13 @@ install( ${DATA_INSTALL_DIR}/etc/ ) +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/share/etc/pki.conf + DESTINATION + ${SYSCONF_INSTALL_DIR}/pki/ +) + # install Python libraries install( DIRECTORY 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 |