diff options
author | 2016-04-26 16:23:53 -0700 | |
---|---|---|
committer | 2016-04-26 16:23:53 -0700 | |
commit | 6b16aaae96d7f8664870da8b4e36ea0da10d667e (patch) | |
tree | d3b6915ba019bae703f6e6d87351a454be2a3aba /tools/buildgen/mako_renderer.py | |
parent | 57d1e082689c96e2721122748b08583d6b63d394 (diff) | |
parent | a4e7ecab1a512bae1c40b9b301661ba24677b0ed (diff) |
merge and resolve conflict
Diffstat (limited to 'tools/buildgen/mako_renderer.py')
-rwxr-xr-x | tools/buildgen/mako_renderer.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tools/buildgen/mako_renderer.py b/tools/buildgen/mako_renderer.py index f629e68eb9..866e6fdb06 100755 --- a/tools/buildgen/mako_renderer.py +++ b/tools/buildgen/mako_renderer.py @@ -81,9 +81,10 @@ def main(argv): plugins = [] output_name = None got_preprocessed_input = False + output_merged = None try: - opts, args = getopt.getopt(argv, 'hm:d:o:p:t:P:w:') + opts, args = getopt.getopt(argv, 'hM:m:d:o:p:t:P:w:') except getopt.GetoptError: out('Unknown option') showhelp() @@ -107,6 +108,12 @@ def main(argv): showhelp() sys.exit(4) module_directory = arg + elif opt == '-M': + if output_merged is not None: + out('Got more than one output merged path') + showhelp() + sys.exit(5) + output_merged = arg elif opt == '-P': assert not got_preprocessed_input assert json_dict == {} @@ -126,6 +133,9 @@ def main(argv): if not got_preprocessed_input: for plugin in plugins: plugin.mako_plugin(json_dict) + if output_merged: + with open(output_merged, 'w') as yaml_file: + yaml_file.write(yaml.dump(json_dict)) for k, v in json_dict.items(): dictionary[k] = bunch.to_bunch(v) |