X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7880db4f8774d9bea39bd8669f9fc3802e7afefb..cf34bb57372b60d8e66cf5c21e9f73b8d0bc23b8:/lib/python/Components/Task.py

diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index 76d4f157..167de21c 100644
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -53,7 +53,7 @@ class Job(object):
 		self.state_changed()
 		self.runNext()
 		sumTaskWeightings = sum([t.weighting for t in self.tasks])
-		self.weightScale = (self.end+1) / float(sumTaskWeightings)
+		self.weightScale = self.end / float(sumTaskWeightings)
 
 	def runNext(self):
 		if self.current_task == len(self.tasks):
@@ -89,7 +89,7 @@ class Job(object):
 		# some Jobs might have a better idea of how to cancel a job
 		self.abort()
 
-class Task(object)	:
+class Task(object):
 	def __init__(self, job, name):
 		self.name = name
 		self.immediate_preconditions = [ ]
@@ -303,13 +303,13 @@ class WorkspaceExistsPrecondition(Condition):
 class DiskspacePrecondition(Condition):
 	def __init__(self, diskspace_required):
 		self.diskspace_required = diskspace_required
-		self.diskspace_available = None
+		self.diskspace_available = 0
 
 	def check(self, task):
 		import os
 		try:
 			s = os.statvfs(task.job.workspace)
-			self.diskspace_available = s.f_bsize * s.f_bavail 
+			self.diskspace_available = s.f_bsize * s.f_bavail
 			return self.diskspace_available >= self.diskspace_required
 		except OSError:
 			return False
@@ -323,7 +323,7 @@ class ToolExistsPrecondition(Condition):
 		if task.cmd[0]=='/':
 			realpath = task.cmd
 		else:
-			realpath = self.cwd + '/' + self.cmd
+			realpath = task.cwd + '/' + task.cmd
 		self.realpath = realpath
 		return os.access(realpath, os.X_OK)