fix: restore roundup-admin display output format w/o pragmas

Do not indent the display output unless user requested protected
fields or headers. This returns the format to what it was prior to
2.3.0.

Parsing roundup-admin output programmaticly was never a use case, but
don't break the output format without a reason.

Author: rouilj

CHANGES.txt

@@ -37,6 +37,11 @@ Fixed:
 - issue2551278 - datetime.datetime.utcnow deprecation. Replace
   calls with equivalent that produces timezone aware dates rather than
   naive dates. (John Rouillard)
+- when using "roundup-admin display" indent the listing only if
+  headers or protected fields are requested. This makes the output
+  look like it did previously to 2.3.0 if the new features aren't
+  used.  Roundup-admin output was never meant to be machine parsed, but
+  don't break it unless required. (John Rouillard)
 
 Features:
 

roundup/admin.py

@@ -521,6 +521,9 @@ def do_display(self, args):
         if len(args) < 1:
             raise UsageError(_('Not enough arguments supplied'))
 
+        display_protected = self.settings['display_protected']
+        display_header =  self.settings['display_header']
+
         # decode the node designator
         for designator in args[0].split(','):
             try:
@@ -533,19 +536,22 @@ def do_display(self, args):
 
             # display the values
             normal_props = sorted(cl.properties)
-            if self.settings['display_protected']:
+            if display_protected:
                 keys = sorted(cl.getprops())
             else:
                 keys = normal_props
 
-            if self.settings['display_header']:
+            if display_header:
                 status = "retired" if cl.is_retired(nodeid) else "active"
                 print('\n[%s (%s)]' % (designator, status))
             for key in keys:
                 value = cl.get(nodeid, key)
                 # prepend * for protected properties else just indent
                 # with space.
-                protected = "*" if key not in normal_props else ' '
+                if display_protected or display_header:
+                    protected = "*" if key not in normal_props else ' '
+                else:
+                    protected = ""
                 print(_('%(protected)s%(key)s: %(value)s') % locals())
 
     def do_export(self, args, export_files=True):