From 237dde92855570426cee1246070ed129b07f1abe Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Thu, 27 Jun 2013 00:30:07 +0200
Subject: [PATCH] Remove task.run() it is hiding missing run functions

---
 base/task.py                            | 3 ---
 plugins/admin_user/adminuser.py         | 1 -
 plugins/build_metadata/buildmetadata.py | 1 -
 providers/ec2/manifest.py               | 2 +-
 providers/ec2/tasks/connection.py       | 2 --
 providers/ec2/tasks/host.py             | 1 -
 providers/ec2/tasks/packages.py         | 2 --
 7 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/base/task.py b/base/task.py
index 84d5174..4da8ad3 100644
--- a/base/task.py
+++ b/base/task.py
@@ -9,9 +9,6 @@ class Task(object):
 	def __init__(self):
 		self._check_ordering()
 
-	def run(self, info):
-		pass
-
 	def __str__(self):
 		return '{module}.{task}'.format(module=self.__module__, task=self.__class__.__name__)
 
diff --git a/plugins/admin_user/adminuser.py b/plugins/admin_user/adminuser.py
index bab52af..e21db40 100644
--- a/plugins/admin_user/adminuser.py
+++ b/plugins/admin_user/adminuser.py
@@ -11,5 +11,4 @@ class AddSudoPackage(Task):
 	before = [CheckPackages]
 
 	def run(self, info):
-		super(AddSudoPackage, self).run(info)
 		info.img_packages[0].add('sudo')
diff --git a/plugins/build_metadata/buildmetadata.py b/plugins/build_metadata/buildmetadata.py
index 9fec61a..f47a4e2 100644
--- a/plugins/build_metadata/buildmetadata.py
+++ b/plugins/build_metadata/buildmetadata.py
@@ -9,5 +9,4 @@ class PrintInfo(Task):
 	after = [GetInfo]
 
 	def run(self, info):
-		super(PrintInfo, self).run(info)
 		print('info')
diff --git a/providers/ec2/manifest.py b/providers/ec2/manifest.py
index 105fb21..89fc366 100644
--- a/providers/ec2/manifest.py
+++ b/providers/ec2/manifest.py
@@ -3,10 +3,10 @@ import base
 
 class Manifest(base.Manifest):
 	def validate(self, data):
+		super(Manifest, self).validate(data)
 		from os import path
 		schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
 		self.schema_validate(data, schema_path)
-		super(Manifest, self).validate(data)
 
 	def parse(self, data):
 		super(Manifest, self).parse(data)
diff --git a/providers/ec2/tasks/connection.py b/providers/ec2/tasks/connection.py
index 336a467..2c2ce19 100644
--- a/providers/ec2/tasks/connection.py
+++ b/providers/ec2/tasks/connection.py
@@ -8,7 +8,6 @@ class GetCredentials(Task):
 	phase = phases.preparation
 
 	def run(self, info):
-		super(GetCredentials, self).run(info)
 		info.credentials = self.get_credentials(info.manifest)
 
 	def get_credentials(self, manifest):
@@ -35,7 +34,6 @@ class Connect(Task):
 	after = [GetCredentials, host.GetInfo]
 
 	def run(self, info):
-		super(Connect, self).run(info)
 		from boto.ec2 import connect_to_region
 		info.connection = connect_to_region(info.host['region'],
 		                                    aws_access_key_id=info.credentials['access_key'],
diff --git a/providers/ec2/tasks/host.py b/providers/ec2/tasks/host.py
index 937856c..23508fb 100644
--- a/providers/ec2/tasks/host.py
+++ b/providers/ec2/tasks/host.py
@@ -25,7 +25,6 @@ class GetInfo(Task):
 	phase = phases.preparation
 
 	def run(self, info):
-		super(GetInfo, self).run(info)
 		import urllib2
 		import json
 		metadata_url = 'http://169.254.169.254/latest/dynamic/instance-identity/document'
diff --git a/providers/ec2/tasks/packages.py b/providers/ec2/tasks/packages.py
index d8b2c71..3517482 100644
--- a/providers/ec2/tasks/packages.py
+++ b/providers/ec2/tasks/packages.py
@@ -7,7 +7,6 @@ class HostPackages(Task):
 	phase = phases.preparation
 
 	def run(self, info):
-		super(HostPackages, self).run(info)
 		packages = set(['debootstrap',
 		                # To make sure a volume is not busy before unmounting we need lsof
 		                'lsof',
@@ -23,7 +22,6 @@ class ImagePackages(Task):
 	phase = phases.preparation
 
 	def run(self, info):
-		super(ImagePackages, self).run(info)
 		manifest = info.manifest
 		# Add some basic packages we are going to need
 		include = set(['udev',