diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-15 16:31:36 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-15 16:31:36 -0400 |
commit | 3da095ee4cd26080861b071b2bdee0479851c398 (patch) | |
tree | 6edd86aa1d58a32fc4c017eda0babdc46217dd79 /src/lib/Bcfg2/Server | |
parent | 7aae23bea73af6a7ba19f1353b2089738b2841e9 (diff) | |
download | bcfg2-3da095ee4cd26080861b071b2bdee0479851c398.tar.gz bcfg2-3da095ee4cd26080861b071b2bdee0479851c398.tar.bz2 bcfg2-3da095ee4cd26080861b071b2bdee0479851c398.zip |
fixed a few straggling perms -> mode changes
Diffstat (limited to 'src/lib/Bcfg2/Server')
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Compare.py | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Pull.py | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/FileProbes.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Compare.py b/src/lib/Bcfg2/Server/Admin/Compare.py index 78b30120a..b5e3c3c01 100644 --- a/src/lib/Bcfg2/Server/Admin/Compare.py +++ b/src/lib/Bcfg2/Server/Admin/Compare.py @@ -14,7 +14,7 @@ class Compare(Bcfg2.Server.Admin.Mode): def __init__(self, setup): Bcfg2.Server.Admin.Mode.__init__(self, setup) - self.important = {'Path': ['name', 'type', 'owner', 'group', 'perms', + self.important = {'Path': ['name', 'type', 'owner', 'group', 'mode', 'important', 'paranoid', 'sensitive', 'dev_type', 'major', 'minor', 'prune', 'encoding', 'empty', 'to', 'recursive', diff --git a/src/lib/Bcfg2/Server/Admin/Pull.py b/src/lib/Bcfg2/Server/Admin/Pull.py index 1ddb9c2ad..acbb44e9e 100644 --- a/src/lib/Bcfg2/Server/Admin/Pull.py +++ b/src/lib/Bcfg2/Server/Admin/Pull.py @@ -73,7 +73,7 @@ class Pull(Bcfg2.Server.Admin.MetadataCore): new_entry = {'type': etype, 'name': ename} for plugin in self.bcore.pull_sources: try: - (owner, group, perms, contents) = \ + (owner, group, mode, contents) = \ plugin.GetCurrentEntry(client, etype, ename) break except Bcfg2.Server.Plugin.PluginExecutionError: @@ -84,7 +84,7 @@ class Pull(Bcfg2.Server.Admin.MetadataCore): try: data = {'owner': owner, 'group': group, - 'perms': perms, + 'mode': mode, 'text': contents} except UnboundLocalError: print("Unable to build entry. " diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index 04a26c86b..8e383ba97 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -27,7 +27,7 @@ except ImportError: DEFAULT_FILE_METADATA = Bcfg2.Options.OptionParser(dict( owner=Bcfg2.Options.MDATA_OWNER, group=Bcfg2.Options.MDATA_GROUP, - mode=Bcfg2.Options.MDATA_PERMS, + mode=Bcfg2.Options.MDATA_MODE, secontext=Bcfg2.Options.MDATA_SECONTEXT, important=Bcfg2.Options.MDATA_IMPORTANT, paranoid=Bcfg2.Options.MDATA_PARANOID, diff --git a/src/lib/Bcfg2/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py index 8bea7719c..8bd1d3504 100644 --- a/src/lib/Bcfg2/Server/Plugins/FileProbes.py +++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py @@ -219,7 +219,7 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, "Info", owner=data.get("owner", Bcfg2.Options.MDATA_OWNER.value), group=data.get("group", Bcfg2.Options.MDATA_GROUP.value), - mode=data.get("mode", Bcfg2.Options.MDATA_PERMS.value), + mode=data.get("mode", Bcfg2.Options.MDATA_MODE.value), encoding=entry.get("encoding", Bcfg2.Options.ENCODING.value)) root = lxml.etree.Element("FileInfo") |