diff --git a/sat_frontends/jp/cmd_info.py b/sat_frontends/jp/cmd_info.py index 89acafbd..9f95b1e8 100644 --- a/sat_frontends/jp/cmd_info.py +++ b/sat_frontends/jp/cmd_info.py @@ -103,9 +103,17 @@ class Disco(base.CommandBase): data_keys = data.keys() data_keys.sort() for key in data_keys: - field_lines.append(A.color(u'\t', C.A_SUBHEADER, key, data[key])) - for value in values: - field_lines.append(A.color(u'\t', A.BOLD, value)) + field_lines.append(A.color(u'\t', C.A_SUBHEADER, key, A.RESET, u': ', + data[key])) + if len(values) == 1: + field_lines.append(A.color(u'\t', C.A_SUBHEADER, u"value", A.RESET, + u': ', values[0] or (A.BOLD + u"UNSET"))) + elif len(values) > 1: + field_lines.append(A.color(u'\t', C.A_SUBHEADER, u"values", A.RESET, + u': ')) + + for value in values: + field_lines.append(A.color(u'\t - ', A.BOLD, value)) fields.append(u'\n'.join(field_lines)) extensions_tpl.append(u'{type_}\n{fields}'.format(type_=type_, fields='\n\n'.join(fields)))