/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2016-06-27 20:21:50 UTC
  • Revision ID: teddy@recompile.se-20160627202150-ml201ilxwjf1g29w
mandos-ctl: Implement --dump-json option

* mandos-ctl (main): Implement --dump-json option
* mandos-ctl.xml (NAME, DESCRIPTION): Change description to the more
                                      accurate "control or query".
  (SYNOPSIS): Add required group around action options and add new
              "--dump-json" option.
  (OPTIONS): Document new "--dump-json" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
405
405
            keywords = defaultkeywords
406
406
        
407
407
        if options.dump_json:
408
 
            json.dump({client["Name"]: {key:
409
 
                                        bool(client[key])
410
 
                                        if isinstance(client[key],
411
 
                                                      dbus.Boolean)
412
 
                                        else client[key]
 
408
            json.dump({client["Name"]: {key: client[key]
413
409
                                        for key in keywords }
414
410
                       for client in clients.values() },
415
411
                      fp = sys.stdout, indent = 4,