Wrap lines in the list of available advices

Now the list of available advices is neatly formatted:

-------------------------
List of available advices
-------------------------
    config-fedora-authconfig : Authconfig instructions for configuring Fedora
                               18/19 client with IPA server without use of SSSD.

The advice header printing has been reformatted to conform with the changes.
This commit is contained in:
Tomas Babej 2013-08-06 12:52:03 +02:00 committed by Martin Kosek
parent d4bf153d64
commit 453d88f886

View File

@ -22,6 +22,7 @@ import os
from ipalib import api from ipalib import api
from ipalib.errors import ValidationError from ipalib.errors import ValidationError
from ipapython import admintool from ipapython import admintool
from textwrap import wrap
""" """
@ -112,9 +113,15 @@ class IpaAdvise(admintool.AdminTool):
# Compute the number of spaces needed for the table to be aligned # Compute the number of spaces needed for the table to be aligned
offset = max_keyword_len - len(keyword) offset = max_keyword_len - len(keyword)
print(" {key} {off}: {desc}".format(key=keyword, prefix = " {key} {off}: ".format(key=keyword, off=' ' * offset)
desc=description, wrapped_description = wrap(description, 80 - len(prefix))
off=' ' * offset))
# Print the first line with the prefix (keyword)
print prefix + wrapped_description[0]
# Print the rest wrapped behind the colon
for line in wrapped_description[1:]:
print "{off}{line}".format(off=' ' * len(prefix), line=line)
def print_header(self, header, print_shell=False): def print_header(self, header, print_shell=False):
header_size = len(header) header_size = len(header)
@ -126,9 +133,10 @@ class IpaAdvise(admintool.AdminTool):
# Do not print out empty header # Do not print out empty header
if header_size > 0: if header_size > 0:
print(prefix + '-' * (header_size - len(prefix))) print(prefix + '-' * 70)
print(prefix + header) for line in wrap(header, 70):
print(prefix + '-' * (header_size - len(prefix))) print(prefix + line)
print(prefix + '-' * 70)
def print_advice(self, keyword): def print_advice(self, keyword):
advice = getattr(api.Advice, keyword, None) advice = getattr(api.Advice, keyword, None)