summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2010-09-23 23:38:18 +0000
committerSol Jerome <sol.jerome@gmail.com>2010-09-26 15:27:08 -0500
commit64090562664d1d619d34130be2553c47409f0013 (patch)
treedaade76be8dbec5c79511a387fe544599fe92e72 /src
parent54f36052f7c6923ebcb02f2c794a9eb1418df0dd (diff)
downloadbcfg2-64090562664d1d619d34130be2553c47409f0013.tar.gz
bcfg2-64090562664d1d619d34130be2553c47409f0013.tar.bz2
bcfg2-64090562664d1d619d34130be2553c47409f0013.zip
bcfg2-repo-validate: Remove non-required attributes (Reported by fearitself on IRC)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6068 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rwxr-xr-xsrc/sbin/bcfg2-repo-validate6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate
index 5e22dcf75..1889c9892 100755
--- a/src/sbin/bcfg2-repo-validate
+++ b/src/sbin/bcfg2-repo-validate
@@ -87,10 +87,10 @@ if __name__ == '__main__':
# verify attributes for configuration entries
# (as defined in doc/server/configurationentries)
# TODO: See if it is possible to do this in the schema instead
- configuration_attrs = {
+ required_configuration_attrs = {
'device':['name', 'owner', 'group', 'dev_type'],
'directory':['name', 'owner', 'group', 'perms'],
- 'file':['name', 'owner', 'group', 'perms', 'encoding', 'empty'],
+ 'file':['name', 'owner', 'group', 'perms'],
'hardlink':['name', 'to'],
'symlink':['name', 'to'],
'ignore':['name'],
@@ -106,7 +106,7 @@ if __name__ == '__main__':
pathtype = posixpath.get('type')
pathset = set(posixpath.attrib.keys())
try:
- required_attrs = set(configuration_attrs[pathtype] \
+ required_attrs = set(required_configuration_attrs[pathtype] \
+ ['type'])
except KeyError:
continue