summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2010-04-26 17:40:15 -0400
committerJason Gerard DeRose <jderose@redhat.com>2010-05-03 13:40:34 -0600
commit2f50668753c77e599e0cef58c85baaa019264e5b (patch)
tree25aec2543f93e68ed0b4f178c8da3dd70588654e /ipalib
parentcef30893ecc7aa7b6cdcef0092b5ba4245af20a2 (diff)
downloadfreeipa-2f50668753c77e599e0cef58c85baaa019264e5b.tar.gz
freeipa-2f50668753c77e599e0cef58c85baaa019264e5b.tar.xz
freeipa-2f50668753c77e599e0cef58c85baaa019264e5b.zip
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.
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/frontend.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index 1881510c..c270981f 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):