diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2009-10-16 03:07:12 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2009-10-16 03:07:12 +0000 |
| commit | 734e9b1f1d67680036651a8dd2c86fe77e9de9d9 (patch) | |
| tree | f4846f870a85c1a6b86c06fa0857fe96fd630a72 | |
| parent | b6da95ace6dcc8b5ff5b56ae17dc5804e3328d8e (diff) | |
| download | bcfg2-734e9b1f1d67680036651a8dd2c86fe77e9de9d9.tar.gz bcfg2-734e9b1f1d67680036651a8dd2c86fe77e9de9d9.tar.bz2 bcfg2-734e9b1f1d67680036651a8dd2c86fe77e9de9d9.zip | |
Fix incorrect mappings and change configfile type to file
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5484 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Client/Tools/POSIX.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/POSIXCompat.py | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index 8127d29fe..7457ca480 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -92,7 +92,7 @@ class POSIX(Bcfg2.Client.Tools.Tool): ('Path', 'device'), ('Path', 'Directory'), ('Path', 'HardLink'), - ('Path', 'Perms'), + ('Path', 'Permissions'), ('Path', 'SymLink'), ('Path', 'nonexistent'), ('Permissions', None), diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index ace400692..928a1dd06 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -86,7 +86,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): basefile = used.pop(0) data = basefile.data if entry.tag == 'Path': - entry.set('type', 'configfile') + entry.set('type', 'file') for delta in used: data = data.strip() data = process_delta(data, delta) diff --git a/src/lib/Server/Plugins/POSIXCompat.py b/src/lib/Server/Plugins/POSIXCompat.py index 4ea2c490c..9cd09d454 100644 --- a/src/lib/Server/Plugins/POSIXCompat.py +++ b/src/lib/Server/Plugins/POSIXCompat.py @@ -6,9 +6,7 @@ __revision__ = '$Revision$' import Bcfg2.Server.Plugin -# FIXME: We will need this mapping if we decide to change the -# specification to use lowercase types for new POSIX entry types -COMPAT_DICT = {'configfile': 'ConfigFile', +COMPAT_DICT = {'file': 'ConfigFile', 'device': 'device', 'directory': 'Directory', 'nonexistent': 'nonexistent', |