diff options
Diffstat (limited to 'base/server/python')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkimessages.py | 6 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/base/server/python/pki/server/deployment/pkimessages.py b/base/server/python/pki/server/deployment/pkimessages.py index 339ee149e..5e996667d 100644 --- a/base/server/python/pki/server/deployment/pkimessages.py +++ b/base/server/python/pki/server/deployment/pkimessages.py @@ -179,6 +179,12 @@ PKIHELPER_CREATE_SECURITY_DATABASES_1 = "executing '%s'" PKIHELPER_DANGLING_SYMLINK_2 = "Dangling symlink '%s'-->'%s'" PKIHELPER_DICTIONARY_MASTER_MISSING_KEY_1 = "KeyError: Master dictionary "\ "is missing the key called '%s'!" +PKIHELPER_DICTIONARY_INTERPOLATION_1 = "Deployment file could not be parsed "\ + "correctly. This might be because of "\ + "unescaped '%%' characters. You must "\ + "escape '%%' characters in deployment "\ + "files (example - 'setting=foo%%%%bar')." +PKIHELPER_DICTIONARY_INTERPOLATION_2 = "Interpolation error (%s)" PKIHELPER_DIRECTORY_IS_EMPTY_1 = "directory '%s' is empty" PKIHELPER_DIRECTORY_IS_NOT_EMPTY_1 = "directory '%s' is NOT empty" PKIHELPER_GID_2 = "GID of '%s' is %s" diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index 523d79e78..8a75b8fe3 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -1120,6 +1120,12 @@ class PKIConfigParser: config.pki_log.error(log.PKIHELPER_DICTIONARY_MASTER_MISSING_KEY_1, err, extra=config.PKI_INDENTATION_LEVEL_2) raise + except ConfigParser.InterpolationSyntaxError as err: + config.pki_log.error(log.PKIHELPER_DICTIONARY_INTERPOLATION_1, + extra=config.PKI_INDENTATION_LEVEL_2) + config.pki_log.error(log.PKIHELPER_DICTIONARY_INTERPOLATION_2, err, + extra=config.PKI_INDENTATION_LEVEL_2) + sys.exit(1) return |