[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 b53278cf2ef17931ae154b31968962edb1a342cb
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Thu Aug 27 00:26:55 2009 +0200

    opimd: disable merging by default

diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index 6af82d1..e8c82ca 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -598,16 +598,12 @@ class GenericDomain():
         merged = 0
 
         # Check if the entry can be merged with one we already know of
-        if int(config.getValue('opimd', self.name.lower()+'_merging_enabled', default='1')):
-            for entry in self._entries:
+        if int(config.getValue('opimd', self.name.lower()+'_merging_enabled', default='0')):
+            for (entry_idx, entry) in enumerate(self._entries):
                 if entry:
                     if entry.attempt_merge(entry_data, backend.name):
-
-                        # Find that entry's ID
-                        for (entry_idx, ent) in enumerate(self._entries):
-                            if ent == entry: entry_id = entry_idx
-                            break
-
+                        entry_id = entry_idx
+                        # TODO: send EntryUpdated signal
                         # Stop trying to merge
                         merged = 1
                         break

-- 
FSO frameworkd Debian packaging