From 2f50668753c77e599e0cef58c85baaa019264e5b Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 26 Apr 2010 17:40:15 -0400 Subject: Fix output of summary and embedded dictionaries Summaries were appearing as "Gettext(...") Embedded dictionaries, such as group membership failures, didn't have labels so were basically just being dumped. --- ipalib/frontend.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipalib/frontend.py') diff --git a/ipalib/frontend.py b/ipalib/frontend.py index 1881510c3..c270981f6 100644 --- a/ipalib/frontend.py +++ b/ipalib/frontend.py @@ -876,11 +876,11 @@ class Command(HasParam): if isinstance(outp, ListOfEntries): textui.print_entries(result, order, labels, print_all) elif isinstance(result, (tuple, list)): - textui.print_entries(result) + textui.print_entries(result, order, labels, print_all) elif isinstance(outp, Entry): textui.print_entry(result, order, labels, print_all) elif isinstance(result, dict): - textui.print_entry(result) + textui.print_entry(result, order, labels, print_all) elif isinstance(result, unicode): if o == 'summary': textui.print_summary(result) @@ -891,7 +891,7 @@ class Command(HasParam): # success or failure. Ignore these. pass elif isinstance(result, int): - textui.print_count(result, '%s %%d' % self.output[o].doc) + textui.print_count(result, '%s %%d' % unicode(self.output[o].doc)) class LocalOrRemote(Command): -- cgit