From 6b6ad527ce90e37bde80cd2d32dd72d392185558 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sun, 1 Dec 2013 23:56:17 +0100
Subject: [PATCH] Reorder plugin init scripts Let validate_manifest() always be
 the first function

---
 plugins/admin_user/__init__.py          | 12 ++++++------
 plugins/build_metadata/__init__.py      |  2 +-
 plugins/prebootstrapped/__init__.py     | 12 ++++++------
 plugins/root_password/__init__.py       | 12 ++++++------
 plugins/unattended_upgrades/__init__.py | 12 ++++++------
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/plugins/admin_user/__init__.py b/plugins/admin_user/__init__.py
index 90fa7b3..5af49c3 100644
--- a/plugins/admin_user/__init__.py
+++ b/plugins/admin_user/__init__.py
@@ -1,5 +1,11 @@
 
 
+def validate_manifest(data, schema_validate):
+	from os import path
+	schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
+	schema_validate(data, schema_path)
+
+
 def tasks(tasklist, manifest):
 	import tasks
 	tasklist.add(tasks.AddSudoPackage,
@@ -7,9 +13,3 @@ def tasks(tasklist, manifest):
 	             tasks.PasswordlessSudo,
 	             tasks.AdminUserCredentials,
 	             tasks.DisableRootLogin)
-
-
-def validate_manifest(data, schema_validate):
-	from os import path
-	schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
-	schema_validate(data, schema_path)
diff --git a/plugins/build_metadata/__init__.py b/plugins/build_metadata/__init__.py
index 71d1abf..994b31b 100644
--- a/plugins/build_metadata/__init__.py
+++ b/plugins/build_metadata/__init__.py
@@ -2,4 +2,4 @@
 
 def tasks(tasklist, manifest):
 	from tasks import WriteMetadata
-	tasklist.add(WriteMetadata
+	tasklist.add(WriteMetadata)
diff --git a/plugins/prebootstrapped/__init__.py b/plugins/prebootstrapped/__init__.py
index 7988778..f46a93e 100644
--- a/plugins/prebootstrapped/__init__.py
+++ b/plugins/prebootstrapped/__init__.py
@@ -10,6 +10,12 @@ from common.tasks import filesystem
 from common.tasks import partitioning
 
 
+def validate_manifest(data, schema_validate):
+	from os import path
+	schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
+	schema_validate(data, schema_path)
+
+
 def tasks(tasklist, manifest):
 	settings = manifest.plugins['prebootstrapped']
 	skip_tasks = [ebs.Create,
@@ -47,9 +53,3 @@ def rollback_tasks(tasklist, tasks_completed, manifest):
 		counter_task(CreateFromSnapshot, volume.Delete)
 	else:
 		counter_task(CreateFromImage, volume.Delete)
-
-
-def validate_manifest(data, schema_validate):
-	from os import path
-	schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
-	schema_validate(data, schema_path)
diff --git a/plugins/root_password/__init__.py b/plugins/root_password/__init__.py
index 91587b8..b65c76b 100644
--- a/plugins/root_password/__init__.py
+++ b/plugins/root_password/__init__.py
@@ -1,13 +1,13 @@
 
 
+def validate_manifest(data, schema_validate):
+	from os import path
+	schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
+	schema_validate(data, schema_path)
+
+
 def tasks(tasklist, manifest):
 	from common.tasks.security import DisableSSHPasswordAuthentication
 	from tasks import SetRootPassword
 	tasklist.remove(DisableSSHPasswordAuthentication)
 	tasklist.add(SetRootPassword)
-
-
-def validate_manifest(data, schema_validate):
-	from os import path
-	schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
-	schema_validate(data, schema_path)
diff --git a/plugins/unattended_upgrades/__init__.py b/plugins/unattended_upgrades/__init__.py
index 8025744..bb87e60 100644
--- a/plugins/unattended_upgrades/__init__.py
+++ b/plugins/unattended_upgrades/__init__.py
@@ -1,12 +1,12 @@
 
 
-def tasks(tasklist, manifest):
-	import tasks
-	tasklist.add(tasks.AddUnattendedUpgradesPackage,
-	             tasks.EnablePeriodicUpgrades)
-
-
 def validate_manifest(data, schema_validate):
 	from os import path
 	schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
 	schema_validate(data, schema_path)
+
+
+def tasks(tasklist, manifest):
+	import tasks
+	tasklist.add(tasks.AddUnattendedUpgradesPackage,
+	             tasks.EnablePeriodicUpgrades)