From 435084983d0396b16a1effbd49100806281d8493 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Mon, 1 Jul 2013 22:38:33 +0200
Subject: [PATCH] tidy up tasks()

---
 providers/ec2/__init__.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/providers/ec2/__init__.py b/providers/ec2/__init__.py
index 476932c..62d469b 100644
--- a/providers/ec2/__init__.py
+++ b/providers/ec2/__init__.py
@@ -15,10 +15,15 @@ def initialize():
 
 
 def tasks(tasklist, manifest):
-	tasklist.add(packages.HostPackages(), packages.ImagePackages(), host.CheckPackages(),
-	             connection.GetCredentials(), host.GetInfo(), connection.Connect())
+	tasklist.add(packages.HostPackages(),
+	             packages.ImagePackages(),
+	             host.CheckPackages(),
+	             connection.GetCredentials(),
+	             host.GetInfo(),
+	             connection.Connect())
 	if manifest.volume['backing'].lower() == 'ebs':
-		tasklist.add(ebs.CreateVolume(), ebs.AttachVolume())
+		tasklist.add(ebs.CreateVolume(),
+		             ebs.AttachVolume())
 	tasklist.add(filesystem.FormatVolume())
 	if manifest.volume['filesystem'].lower() == 'xfs':
 		tasklist.add(filesystem.AddXFSProgs())
@@ -28,11 +33,11 @@ def tasks(tasklist, manifest):
 	tasklist.add(filesystem.CreateMountDir(), filesystem.MountVolume())
 	if manifest.bootstrapper['tarball']:
 		tasklist.add(bootstrap.MakeTarball())
-	tasklist.add(bootstrap.Bootstrap())
-	tasklist.add(filesystem.MountSpecials())
-	tasklist.add(config.GenerateLocale())
-	tasklist.add(config.SetTimezone())
-	tasklist.add(config.AptSources())
+	tasklist.add(bootstrap.Bootstrap(),
+	             filesystem.MountSpecials(),
+	             config.GenerateLocale(),
+	             config.SetTimezone(),
+	             config.AptSources())
 
 	from common.tasks import TriggerRollback
 	tasklist.add(TriggerRollback())