| 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:
|
|
|