diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-01 11:25:46 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-01 11:28:25 -0400 |
| commit | 5ca04191ac174e9b62cce2804f56f23b030d10a5 (patch) | |
| tree | 506cb5e97917d7fa7e0a0f8f10c34a28891dcc54 /src | |
| parent | 2937c360fb7bd0c674ec484bec1a21d3b6f24186 (diff) | |
| download | bcfg2-5ca04191ac174e9b62cce2804f56f23b030d10a5.tar.gz bcfg2-5ca04191ac174e9b62cce2804f56f23b030d10a5.tar.bz2 bcfg2-5ca04191ac174e9b62cce2804f56f23b030d10a5.zip | |
made ACLs work in info.xml
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgInfoXML.py | 6 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgInfoXML.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgInfoXML.py index 8e962efb4..92cf45824 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgInfoXML.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgInfoXML.py @@ -22,3 +22,9 @@ class CfgInfoXML(CfgInfo): def handle_event(self, event): self.infoxml.HandleEvent() + + def _set_info(self, entry, info): + CfgInfo._set_info(self, entry, info) + if '__children__' in info: + for child in info['__children__']: + entry.append(child) diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index 081a68639..5a7edbaff 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -114,7 +114,8 @@ class CfgInfo(CfgBaseFileMatcher): def _set_info(self, entry, info): for key, value in list(info.items()): - entry.attrib.__setitem__(key, value) + if not key.startswith("__"): + entry.attrib.__setitem__(key, value) class CfgVerifier(CfgBaseFileMatcher): |