From f075d1f2b9d42d83032e67ad8d84687eeffa1901 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sun, 6 Oct 2013 14:08:53 +0200
Subject: [PATCH] Remove ambiguous tasklist function replace()

---
 base/tasklist.py                    | 4 ----
 plugins/prebootstrapped/__init__.py | 9 ++++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/base/tasklist.py b/base/tasklist.py
index 68b1427..ec530ef 100644
--- a/base/tasklist.py
+++ b/base/tasklist.py
@@ -16,10 +16,6 @@ class TaskList(object):
 		for task in args:
 			self.tasks.discard(task)
 
-	def replace(self, task, replacement):
-		self.remove(task)
-		self.add(replacement)
-
 	def run(self, bootstrap_info):
 		task_list = self.create_list(self.tasks)
 		log.debug('Tasklist:\n\t{list}'.format(list='\n\t'.join(repr(task) for task in task_list)))
diff --git a/plugins/prebootstrapped/__init__.py b/plugins/prebootstrapped/__init__.py
index b0ee99f..35e7518 100644
--- a/plugins/prebootstrapped/__init__.py
+++ b/plugins/prebootstrapped/__init__.py
@@ -13,7 +13,10 @@ from common.tasks import partitioning
 
 def tasks(tasklist, manifest):
 	settings = manifest.plugins['prebootstrapped']
-	skip_tasks = [filesystem.Format,
+	skip_tasks = [ebs.Create,
+	              loopback.Create,
+
+	              filesystem.Format,
 	              partitioning.PartitionVolume,
 	              filesystem.TuneVolumeFS,
 	              filesystem.AddXFSProgs,
@@ -22,7 +25,7 @@ def tasks(tasklist, manifest):
 	              bootstrap.Bootstrap]
 	if manifest.volume['backing'] == 'ebs':
 		if 'snapshot' in settings and settings['snapshot'] is not None:
-			tasklist.replace(ebs.Create, CreateFromSnapshot)
+			tasklist.add(CreateFromSnapshot)
 			tasklist.remove(*skip_tasks)
 			if 'boot' in manifest.volume['partitions']:
 				tasklist.add(SetBootMountDir)
@@ -30,7 +33,7 @@ def tasks(tasklist, manifest):
 			tasklist.add(Snapshot)
 	else:
 		if 'image' in settings and settings['image'] is not None:
-			tasklist.replace(loopback.Create, CreateFromImage)
+			tasklist.add(CreateFromImage)
 			tasklist.remove(*skip_tasks)
 			if 'boot' in manifest.volume['partitions']:
 				tasklist.add(SetBootMountDir)