summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Admin
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-10-15 16:31:36 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-10-15 16:31:36 -0400
commit3da095ee4cd26080861b071b2bdee0479851c398 (patch)
tree6edd86aa1d58a32fc4c017eda0babdc46217dd79 /src/lib/Bcfg2/Server/Admin
parent7aae23bea73af6a7ba19f1353b2089738b2841e9 (diff)
downloadbcfg2-3da095ee4cd26080861b071b2bdee0479851c398.tar.gz
bcfg2-3da095ee4cd26080861b071b2bdee0479851c398.tar.bz2
bcfg2-3da095ee4cd26080861b071b2bdee0479851c398.zip
fixed a few straggling perms -> mode changes
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin')
-rw-r--r--src/lib/Bcfg2/Server/Admin/Compare.py2
-rw-r--r--src/lib/Bcfg2/Server/Admin/Pull.py4
2 files changed, 3 insertions, 3 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. "