[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Sebastian Krzyszkowiak]

The following commit has been merged in the debian branch:
commit 82f70de87ae343bc421497534383f1ca4aef6fbd
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Mon Sep 7 00:20:09 2009 +0200

    opimd: Tasks: fix UnfinishedTasks

diff --git a/framework/subsystems/opimd/docs/TODO b/framework/subsystems/opimd/docs/TODO
index 10bbda5..2ecf609 100644
--- a/framework/subsystems/opimd/docs/TODO
+++ b/framework/subsystems/opimd/docs/TODO
@@ -1,7 +1,5 @@
 Near future:
 * Initialized signal in source
-* fix UnfinishedTasks
-* fix GetMultipleResults (messages)
 In mean-time:
 * write documentation
 After that:
diff --git a/framework/subsystems/opimd/pimd_tasks.py b/framework/subsystems/opimd/pimd_tasks.py
index 528a5fb..b58c0c2 100644
--- a/framework/subsystems/opimd/pimd_tasks.py
+++ b/framework/subsystems/opimd/pimd_tasks.py
@@ -229,10 +229,9 @@ class TaskDomain(Domain, GenericDomain):
         new_task_id = len(self._entries)
         task_id = GenericDomain.register_entry(self, backend, task_data)
         if task_id == new_task_id:
-            if task_data.has_key('Finished'):
-                if not task_data['Finished']:
-                    self._unfinished_tasks += 1
-                    self.UnfinishedTasks(self._unfinished_tasks)
+            if not task_data.get('Finished'):
+                self._unfinished_tasks += 1
+                self.UnfinishedTasks(self._unfinished_tasks)
         return task_id
 
  
@@ -323,7 +322,7 @@ class TaskDomain(Domain, GenericDomain):
         self.check_entry_id(num_id)
 
         task = self._entries[num_id].get_fields(self._entries[num_id]._field_idx)
-        if not task['Finished']:
+        if not task.get('Finished'):
             self._unfinished_tasks -= 1
             self.UnfinishedTasks(self._unfinished_tasks)
 
@@ -353,10 +352,10 @@ class TaskDomain(Domain, GenericDomain):
         task = taskif.get_fields(callif._task_idx)
 
         if task.has_key('Finished') or data.has_key('Finished'):
-            if task['Finished'] and not data.get('Finished'):
+            if task.get('Finished') and not data.get('Finished'):
                 self._unfinished_tasks -= 1
                 self.UnfinishedTasks(self._unfinished_tasks)
-            elif not task['Finished'] and data.get('Finished'):
+            elif not task.get('Finished') and data.get('Finished'):
                 self._unfinished_tasks += 1
                 self.UnfinishedTasks(self._unfinished_tasks)
 

-- 
FSO frameworkd Debian packaging