diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-11-21 18:32:43 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-11-21 19:00:12 +0100 |
| commit | d1cfc16642d28d52345cdbc50a4fe2024e5cd0ad (patch) | |
| tree | e2b8cb3e9a35f37fa1f0cad18f437fbde8de246a /src/lib/Bcfg2/Server | |
| parent | 838067138828a8ebf1d4cb37b47d87c07d4c8aae (diff) | |
| download | bcfg2-d1cfc16642d28d52345cdbc50a4fe2024e5cd0ad.tar.gz bcfg2-d1cfc16642d28d52345cdbc50a4fe2024e5cd0ad.tar.bz2 bcfg2-d1cfc16642d28d52345cdbc50a4fe2024e5cd0ad.zip | |
Server/Lint: name attribute is required for all Path entries
Diffstat (limited to 'src/lib/Bcfg2/Server')
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/RequiredAttrs.py | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py index ebf4c4954..91ef036fb 100644 --- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py +++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py @@ -53,26 +53,25 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): def __init__(self, *args, **kwargs): Bcfg2.Server.Lint.ServerPlugin.__init__(self, *args, **kwargs) self.required_attrs = dict( - Path=dict( - device=dict(name=is_filename, - owner=is_username, - group=is_username, - dev_type=lambda v: v in device_map), - directory=dict(name=is_filename, owner=is_username, - group=is_username, mode=is_octal_mode), - file=dict(name=is_filename, owner=is_username, - group=is_username, mode=is_octal_mode, - __text__=None), - hardlink=dict(name=is_filename, to=is_filename), - symlink=dict(name=is_filename), - ignore=dict(name=is_filename), - nonexistent=dict(name=is_filename), - permissions=dict(name=is_filename, owner=is_username, - group=is_username, mode=is_octal_mode), - vcs=dict(vcstype=lambda v: (v != 'Path' and - hasattr(Bcfg2.Client.Tools.VCS.VCS, - "Install%s" % v)), - revision=None, sourceurl=None)), + Path={ + '__any__': dict(name=is_filename), + 'device': dict(owner=is_username, group=is_username, + dev_type=lambda v: v in device_map), + 'directory': dict(owner=is_username, group=is_username, + mode=is_octal_mode), + 'file': dict(owner=is_username, group=is_username, + mode=is_octal_mode, __text__=None), + 'hardlink': dict(to=is_filename), + 'symlink': dict(), + 'ignore': dict(), + 'nonexistent': dict(), + 'permissions': dict(owner=is_username, group=is_username, + mode=is_octal_mode), + 'vcs': dict(vcstype=lambda v: (v != 'Path' and + hasattr(Bcfg2.Client.Tools.VCS.VCS, + "Install%s" % v)), + revision=None, sourceurl=None), + }, Service={"__any__": dict(name=None), "smf": dict(name=None, FMRI=None)}, Action={None: dict(name=None, |