1293868 - Write mozinfo.json deterministically

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Gregory Szorc [:gps]]

Patch forthcoming.

Comment 1

[Gregory Szorc [:gps]]

Attachment: Bug 1293868 - Write mozinfo.json deterministically;

And with indentation so it is easier for humans to read.

Review commit: https://reviewboard.mozilla.org/r/70544/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/70544/

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8779590 [details]
Bug 1293868 - Write mozinfo.json deterministically;

https://reviewboard.mozilla.org/r/70544/#review68580

::: python/mozbuild/mozbuild/mozinfo.py:159
(Diff revision 1)
> -            json.dump(build_conf, f)
> +            json.dump(build_conf, f, sort_keys=True, indent=4)
>      else:
> -        json.dump(build_conf, file)
> +        json.dump(build_conf, file, sort_keys=True, indent=4)

It would be nicer if this wasn't repeated.

How about

if isinstance(file, basestring):
    file = open(file, 'wb')

json.dump(build_conf, file, sort_keys=True, indent=4)

?

Comment 3

[Gregory Szorc [:gps]]

Comment on attachment 8779590 [details]
Bug 1293868 - Write mozinfo.json deterministically;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/70544/diff/1-2/

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/928b859ecc50
Write mozinfo.json deterministically; r=glandium

Comment 5

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/928b859ecc50