Minor cleanup

This commit is contained in:
Anders Ingemann 2013-12-01 12:24:42 +01:00
parent 6138f88ab9
commit 80d1a7ffc0
2 changed files with 6 additions and 7 deletions

View file

@ -15,9 +15,7 @@
}, },
"required": ["username"] "required": ["username"]
} }
}, }
"required": ["admin_user"]
} }
}, }
"required": ["plugins"]
} }

View file

@ -8,9 +8,10 @@ def validate_manifest(data, schema_validate):
def tasks(tasklist, manifest): def tasks(tasklist, manifest):
from tasks import AptSources, InstallRemotePackages, InstallLocalPackages from tasks import AptSources, InstallRemotePackages, InstallLocalPackages
if 'sources' in manifest.plugins['packages']: packages = manifest.plugins['packages']
if 'sources' in packages:
tasklist.add(AptSources) tasklist.add(AptSources)
if 'remote' in manifest.plugins['packages']: if 'remote' in packages:
tasklist.add(InstallRemotePackages) tasklist.add(InstallRemotePackages)
if 'local' in manifest.plugins['packages']: if 'local' in packages:
tasklist.add(InstallLocalPackages) tasklist.add(InstallLocalPackages)