services/service_manager/public/tools/manifest/manifest_collator.py - Issue 2419723002: Move services/shell to services/service_manager

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: services/service_manager/public/tools/manifest/manifest_collator.py

Issue 2419723002: Move services/shell to services/service_manager (Closed)

Patch Set: rebase Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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