Merge ~jocave/checkbox-ng:indent-manifest-json into checkbox-ng:master

[Jonathan Cave]

When dumping the machine-manifest.json file (e.g. after the collect-manifest job ran) request to indent the file rather using the most compact output.

This means if for some reason you want to edit the inspect the file or edit it by hand you can more easily find the entry you want.

Tested by building a snap and re-running collect-manifest job.

[Maciej Kisielewski (kissiel)]

LGTM, +1

review: Approve

diff --git a/plainbox/impl/providers/manifest/bin/plainbox-manifest-collect b/plainbox/impl/providers/manifest/bin/plainbox-manifest-collect
index 0dfb02a..dbffaee 100755
--- a/plainbox/impl/providers/manifest/bin/plainbox-manifest-collect
+++ b/plainbox/impl/providers/manifest/bin/plainbox-manifest-collect
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # This file is part of Checkbox.
 #
-# Copyright 2015 Canonical Ltd.
+# Copyright 2015-2018 Canonical Ltd.
 # Written by:
 #   Zygmunt Krynicki <[e-mail]>
 #
@@ -151,7 +151,7 @@ def main():
         print(_("Saving manifest to {}").format(args.manifest))
         os.makedirs(os.path.dirname(args.manifest), exist_ok=True)
         with open(args.manifest, 'wt', encoding='UTF-8') as stream:
-            json.dump(manifest, stream, sort_keys=True)
+            json.dump(manifest, stream, sort_keys=True, indent=2)
     else:
         print(_("No changes to the manifest are required"))