diff options
| author | Pavel Zuna <pzuna@redhat.com> | 2010-01-12 16:33:16 +0100 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-01-20 16:53:28 -0500 |
| commit | cfe47a35531d841a0a765943aac1296a2a3ac99b (patch) | |
| tree | b224804f8af8da7fb5c72774e4059fec802a5542 | |
| parent | 54631247a7adcaeb60ad1b7b58ffef2e151c386d (diff) | |
| download | freeipa-cfe47a35531d841a0a765943aac1296a2a3ac99b.tar.gz freeipa-cfe47a35531d841a0a765943aac1296a2a3ac99b.tar.xz freeipa-cfe47a35531d841a0a765943aac1296a2a3ac99b.zip | |
Temporary fix for name collision of textui.print_entry.
Somehow there's two of them... rename old one to print_entry1.
| -rw-r--r-- | ipalib/cli.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/baseldap.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index d0feaaea3..41708194d 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -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. diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 0e4eed1b3..17db04826 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 ) |