git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix off-by-one error on the progress and fix vars in ToolExistsPrecondition
[enigma2.git]
/
lib
/
python
/
Components
/
Task.py
diff --git
a/lib/python/Components/Task.py
b/lib/python/Components/Task.py
index 76d4f15707652dd0eddddd019192d83a92ce48c7..07b9d3f5db8383fb32504b7450d2678c46f663e2 100644
(file)
--- 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.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):
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()
# 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 = [ ]
def __init__(self, job, name):
self.name = name
self.immediate_preconditions = [ ]
@@
-323,7
+323,7
@@
class ToolExistsPrecondition(Condition):
if task.cmd[0]=='/':
realpath = task.cmd
else:
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)
self.realpath = realpath
return os.access(realpath, os.X_OK)