diff options
| author | Jack Magne <jmagne@localhost.localdomain> | 2014-12-11 20:20:40 -0800 |
|---|---|---|
| committer | Jack Magne <jmagne@localhost.localdomain> | 2014-12-16 19:59:23 -0800 |
| commit | 21d831010a7e0fe8d21e1ee286eb654bad6a21e3 (patch) | |
| tree | cfcd0d878294ff4a57274ada8ae7492d96eaffc5 /base/server/python/pki/server/deployment/pkimessages.py | |
| parent | 4083b0d6fd3af89cf638224d0081d9dd76eb1192 (diff) | |
| download | pki-21d831010a7e0fe8d21e1ee286eb654bad6a21e3.tar.gz pki-21d831010a7e0fe8d21e1ee286eb654bad6a21e3.tar.xz pki-21d831010a7e0fe8d21e1ee286eb654bad6a21e3.zip | |
Fix-for-Bug-1170867-TPS-Installation-Failed
Fix now includes last review comments where we decided to consolidate 3 of the
ldif files: schema.ldif,database.ldif, and manager.ldif.
Each one of these 3 files contains the data needed for any subsystem for that file.
The subsystem specific files for these 3 go away in the source tree.
The first iteration of this fix was copying these 3 files into an undesirable directory.
This is no longer the case.
Extra code in the python installer allows one to establish a "file exclusion" callback to
keep a set of desired files from being copied when the installer does a directory copy.
All subsystems have been tested, including TPS with a brand new DS (which was the original reason for this fix),
and they appear to work fine.
Addressed further review comments:
1. Removed trailing whitespace instances from schema.ldif which had some.
2. Used pycharm to remove the few PEP violations I had previously added to the Python code.
3. Changed the format of the schema.ldif file to make all the entries use the same style.
Previously the TPS entries was using an all in one syntax. No more since now each entry is separate.
4. Changed the name of an argument in one of the new Python methods to get rid of a camelCase instance.
5. Tested everything to work as before, including basic TPS operations such as Format.
Fixed a method comment string and fixed some typos.
Diffstat (limited to 'base/server/python/pki/server/deployment/pkimessages.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkimessages.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/base/server/python/pki/server/deployment/pkimessages.py b/base/server/python/pki/server/deployment/pkimessages.py index 2b12851cf..ecfbe5d0b 100644 --- a/base/server/python/pki/server/deployment/pkimessages.py +++ b/base/server/python/pki/server/deployment/pkimessages.py @@ -407,3 +407,4 @@ SKIP_SELINUX_SPAWN_1 = "skip populating '%s'" SKIP_SLOT_ASSIGNMENT_SPAWN_1 = "skip assigning slots for '%s'" SKIP_SUBSYSTEM_SPAWN_1 = "skip populating '%s'" SKIP_WEBAPP_DEPLOYMENT_SPAWN_1 = "skip deploying '%s'" +FILE_EXCLUDE_CALLBACK_2 = "file exclude callback src '%s' names '%s'" |