IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for name collision of textui.print_entry.

Browse Source 
Somehow there's two of them... rename old one to print_entry1.
This commit is contained in:
Pavel Zuna 2010-01-12 16:33:16 +01:00 committed by Rob Crittenden
parent 54631247a7
commit cfe47a3553
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipalib/cli.py
View File

@ -277,7 +277,7 @@ class textui(backend.Backend):
for line in text[1:]:
self.print_plain('%s%s' % (s_indent, line))
def print_entry(self, entry, indent=1, attr_map={}, attr_order=['dn'],
def print_entry1(self, entry, indent=1, attr_map={}, attr_order=['dn'],
one_value_per_line=True):
"""
Print an ldap entry dict.

4
ipalib/plugins/baseldap.py
View File

@ -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
)