[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819
Sebastian Krzyszkowiak
seba.dos1 at gmail.com
Sat Aug 6 08:18:50 UTC 2011
The following commit has been merged in the debian branch:
commit 6669f486e4ea68f6425e9532ea2bde486adf4425
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date: Sun Dec 6 18:10:22 2009 +0100
opimd: generic: take care if FieldTypes isn't None on loading
diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index 97bf5da..a4efd8e 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -664,6 +664,8 @@ class GenericDomain():
pickleFile.close()
else:
self.FieldTypes = self.DefaultTypes
+ if not self.FieldTypes:
+ self.FieldTypes = {}
@classmethod
def save_field_types(self):
@@ -698,10 +700,7 @@ class GenericDomain():
@classmethod
def list_fields(self):
- if self.FieldTypes:
- return self.FieldTypes
- else:
- return {}
+ return self.FieldTypes
def enumerate_items(self, backend):
"""Enumerates all entry data belonging to a specific backend
--
FSO frameworkd Debian packaging
More information about the pkg-fso-commits
mailing list