[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 24c16346bc0550c685bee27166f4ef16949ddf62
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Wed Jul 29 22:03:26 2009 +0200

    opimd: make merging a little faster and fix bug with duplicates

diff --git a/framework/subsystems/opimd/pimd_calls.py b/framework/subsystems/opimd/pimd_calls.py
index 3d6a22e..fd0a8f5 100644
--- a/framework/subsystems/opimd/pimd_calls.py
+++ b/framework/subsystems/opimd/pimd_calls.py
@@ -306,7 +306,7 @@ class Call():
         duplicated = True
         for field_name in call_fields:
             try:
-                if self.get_content()[field_name]!=call_fields[field_name]:
+                if self[field_name]!=call_fields[field_name]:
                     duplicated = False
                     break
             except KeyError:
diff --git a/framework/subsystems/opimd/pimd_contacts.py b/framework/subsystems/opimd/pimd_contacts.py
index daa7caf..e06767e 100644
--- a/framework/subsystems/opimd/pimd_contacts.py
+++ b/framework/subsystems/opimd/pimd_contacts.py
@@ -305,7 +305,7 @@ class Contact():
         duplicated = True
         for field_name in contact_fields:
             try:
-                if self.get_content()[field_name]!=contact_fields[field_name]:
+                if self[field_name]!=contact_fields[field_name]:
                     duplicated = False
                     break
             except KeyError:
@@ -325,7 +325,7 @@ class Contact():
                 if field_name!='Path':
                     field_value=contact_fields[field_name]
                     try:
-                        if self.get_content()[field_name]!=field_value:
+                        if self[field_name]!=field_value:
                             merge[0] = 0
                             break
                         else:
diff --git a/framework/subsystems/opimd/pimd_messages.py b/framework/subsystems/opimd/pimd_messages.py
index 2073c10..ed4463e 100644
--- a/framework/subsystems/opimd/pimd_messages.py
+++ b/framework/subsystems/opimd/pimd_messages.py
@@ -171,7 +171,7 @@ class Message():
 
 
     def __repr__(self):
-        return str(get_content())
+        return str(self.get_content())
 
 
     def rebuild_index(self):
@@ -307,7 +307,7 @@ class Message():
         duplicated = True
         for field_name in message_fields:
             try:
-                if self.get_content()[field_name]!=message_fields[field_name]:
+                if self[field_name]!=message_fields[field_name]:
                     duplicated = False
                     break
             except KeyError:
@@ -328,7 +328,7 @@ class Message():
                 if field_name!='Path':
                     field_value=message_fields[field_name]
                     try:
-                        if self.get_content()[field_name]!=field_value:
+                        if self[field_name]!=field_value:
                             merge[0] = 0
                             break
                         else:

-- 
FSO frameworkd Debian packaging