[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 7ce7d1bb0825b0fad454c0d5af796b259884ec34
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Sat Aug 29 22:00:38 2009 +0200

    opimd: kill duplicates! We don't like them!

diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index e1b125d..c8b55f9 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -265,8 +265,11 @@ class GenericEntry():
         @return True on successful merge, False otherwise"""
 
         duplicated = True
+        self_fields = self.get_content()
         for field_name in entry_fields:
-            if self[field_name]!=entry_fields[field_name]:
+            if entry_fields[field_name] and self_fields.get(field_name) and self_fields[field_name]!=entry_fields[field_name]:
+                print "self:  " + str(self_fields.get(field_name))
+                print "entry: " + str(entry_fields[field_name])
                 duplicated = False
                 break
 
@@ -281,7 +284,7 @@ class GenericEntry():
         for field_name in entry_fields:
             if not field_name.startswith('_') and field_name!='Path':
                 field_value=entry_fields[field_name]
-                if self[field_name]!=field_value:
+                if self_fields.get(field_name) and self_fields[field_name]!=field_value:
                     merge[0] = 0
                     break
                 else:

-- 
FSO frameworkd Debian packaging