From 80d1a7ffc0ac6c3e418ef4ec1f0e528783552ede Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 1 Dec 2013 12:24:42 +0100 Subject: [PATCH] Minor cleanup --- plugins/admin_user/manifest-schema.json | 6 ++---- plugins/packages/__init__.py | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/admin_user/manifest-schema.json b/plugins/admin_user/manifest-schema.json index 422877f..fc3c421 100644 --- a/plugins/admin_user/manifest-schema.json +++ b/plugins/admin_user/manifest-schema.json @@ -15,9 +15,7 @@ }, "required": ["username"] } - }, - "required": ["admin_user"] + } } - }, - "required": ["plugins"] + } } diff --git a/plugins/packages/__init__.py b/plugins/packages/__init__.py index 01962c6..4134737 100644 --- a/plugins/packages/__init__.py +++ b/plugins/packages/__init__.py @@ -8,9 +8,10 @@ def validate_manifest(data, schema_validate): def tasks(tasklist, manifest): from tasks import AptSources, InstallRemotePackages, InstallLocalPackages - if 'sources' in manifest.plugins['packages']: + packages = manifest.plugins['packages'] + if 'sources' in packages: tasklist.add(AptSources) - if 'remote' in manifest.plugins['packages']: + if 'remote' in packages: tasklist.add(InstallRemotePackages) - if 'local' in manifest.plugins['packages']: + if 'local' in packages: tasklist.add(InstallLocalPackages)