summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2010-05-14 07:59:01 (GMT)
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2010-05-14 07:59:01 (GMT)
commit06440d2592372576ad2028d9c57a80d47c705fd6 (patch)
treebeb0e3aa2eb7ad871057513de79ab75746f388fa
parentfd1af0f3cbfdef7530988b5c7c10754bee6bc45c (diff)
downloadpratic-06440d2592372576ad2028d9c57a80d47c705fd6.zip
pratic-06440d2592372576ad2028d9c57a80d47c705fd6.tar.gz
pratic-06440d2592372576ad2028d9c57a80d47c705fd6.tar.bz2
Work around missing function in python-ldap for etch
-rw-r--r--idp/debian/changelog8
-rw-r--r--idp/extra/modules/services_ui.ptl2
2 files changed, 9 insertions, 1 deletions
diff --git a/idp/debian/changelog b/idp/debian/changelog
index 812ccaf..bfba4ea 100644
--- a/idp/debian/changelog
+++ b/idp/debian/changelog
@@ -1,4 +1,10 @@
-authentic-pratic (1.0.6ubuntu1) karmic; urgency=low
+authentic-pratic (1.0.8) pratic; urgency=low
+
+ * Work around missing function ldap.dn.str2dn in etch package python-ldap
+
+ -- Benjamin Dauvergne <bdauvergne@entrouvert.com> Fri, 14 May 2010 09:58:01 +0200
+
+authentic-pratic (1.0.7) pratic; urgency=low
* Patches from aeb6585052fb30c2a33625863df07cb6d2584526 to 43b5c68ef0c958df619539a4f2ad62099ab998b8
* Check collectivity exists when loading it from cookie
diff --git a/idp/extra/modules/services_ui.ptl b/idp/extra/modules/services_ui.ptl
index b463962..552dcb6 100644
--- a/idp/extra/modules/services_ui.ptl
+++ b/idp/extra/modules/services_ui.ptl
@@ -371,6 +371,8 @@ class ServiceDirectory(Directory):
for si in service_instances:
sid=si.cdg59siid
try:
+ if not hasattr(ldap.dn, 'str2dn'):
+ raise KeyError
ou=[x[0][1] for x in ldap.dn.str2dn(si.dn, flags=ldap.DN_FORMAT_LDAPV3) if x[0][0] == 'ou' ][0]
collectivity = directory.get_collectivity(ou)
ou = collectivity.ou