From cfe47a35531d841a0a765943aac1296a2a3ac99b Mon Sep 17 00:00:00 2001 From: Pavel Zuna Date: Tue, 12 Jan 2010 16:33:16 +0100 Subject: Temporary fix for name collision of textui.print_entry. Somehow there's two of them... rename old one to print_entry1. --- ipalib/plugins/baseldap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipalib/plugins') diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 0e4eed1b..17db0482 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -111,7 +111,7 @@ class LDAPObject(Object): def print_entry(self, textui, entry, *keys, **options): if options.get('raw', False): textui.print_attribute('dn', entry[0]) - textui.print_entry(entry[1], attr_order=self.attribute_order) + textui.print_entry1(entry[1], attr_order=self.attribute_order) else: if self.primary_key and keys[-1] is not None: textui.print_attribute( @@ -123,7 +123,7 @@ class LDAPObject(Object): for a in self.hidden_attributes: if a in entry_attrs: del entry_attrs[a] - textui.print_entry( + textui.print_entry1( entry_attrs, attr_map=self.attribute_names, attr_order=self.attribute_order, one_value_per_line=False ) -- cgit