Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1176)

Unified Diff: mojo/public/tools/manifest/manifest_collator.py

Issue 1743473002: Change Mojo URLs to structured names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@18collapse
Patch Set: . Created 4 years, 10 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/mojo_shell.gyp ('k') | mojo/services/network/network_service_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/tools/manifest/manifest_collator.py
diff --git a/mojo/public/tools/manifest/manifest_collator.py b/mojo/public/tools/manifest/manifest_collator.py
index 7acc76be7461bced25b7387f83182e401e28354f..e05763bb3ea20d0809096c4a536e4637afd1e5ef 100755
--- a/mojo/public/tools/manifest/manifest_collator.py
+++ b/mojo/public/tools/manifest/manifest_collator.py
@@ -31,11 +31,15 @@ def main():
if parent == None:
return 1
- parsed = urlparse.urlparse(parent['url'])
- if args.application_name != parsed.hostname:
+ app_path = parent['name'].split(':')[1]
+ if app_path.startswith('//'):
+ raise ValueError("Application name path component '%s' must not start " \
+ "with //" % app_path)
+
+ if args.application_name != app_path:
raise ValueError("Application name '%s' specified in build file does not " \
"match application name '%s' specified in manifest." %
- (args.application_name, parsed.hostname))
+ (args.application_name, app_path))
applications = []
for child in children:
« no previous file with comments | « mojo/mojo_shell.gyp ('k') | mojo/services/network/network_service_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698