| OLD | NEW |
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2016 The Chromium Authors. All rights reserved. | 2 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """ A collator for Service Manifests """ | 6 """ A collator for Service Manifests """ |
| 7 | 7 |
| 8 import argparse | 8 import argparse |
| 9 import json | 9 import json |
| 10 import os | 10 import os |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 for overlay_path in args.overlays: | 97 for overlay_path in args.overlays: |
| 98 MergeManifestOverlay(parent, ParseJSONFile(overlay_path)) | 98 MergeManifestOverlay(parent, ParseJSONFile(overlay_path)) |
| 99 | 99 |
| 100 with open(args.output, 'w') as output_file: | 100 with open(args.output, 'w') as output_file: |
| 101 json.dump(parent, output_file) | 101 json.dump(parent, output_file) |
| 102 | 102 |
| 103 return 0 | 103 return 0 |
| 104 | 104 |
| 105 if __name__ == "__main__": | 105 if __name__ == "__main__": |
| 106 sys.exit(main()) | 106 sys.exit(main()) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2419063003:
Move services/shell to services/service_manager (Closed)
