Bug 1411951 - Use mozpack.path.normsep when generating chrome entry paths for langpack manifest.json. r?mshal draft
authorZibi Braniecki <zbraniecki@mozilla.com>
Sat, 28 Oct 2017 21:40:12 -0700
changeset 692220 ec666771435b52a2b5fa9dbc977e166bbffb1496
parent 690453 41cbd2998e63fcaf12b1aea6411c6b7da5ee3ef6
child 738708 50ba9bba02f03484b3fc4c02676070700ae59c3b
push id87444
push userbmo:gandalf@aviary.pl
push dateThu, 02 Nov 2017 19:14:45 +0000
reviewersmshal
bugs1411951
milestone58.0a1
Bug 1411951 - Use mozpack.path.normsep when generating chrome entry paths for langpack manifest.json. r?mshal MozReview-Commit-ID: L8kVm1ISkzD
python/mozbuild/mozbuild/action/langpack_manifest.py
--- a/python/mozbuild/mozbuild/action/langpack_manifest.py
+++ b/python/mozbuild/mozbuild/action/langpack_manifest.py
@@ -13,16 +13,17 @@ from __future__ import absolute_import
 import argparse
 import sys
 import os
 import json
 import io
 import datetime
 import requests
 import mozversioncontrol
+import mozpack.path as mozpath
 from mozpack.chrome.manifest import (
     Manifest,
     ManifestLocale,
     parse_manifest,
 )
 from mozbuild.preprocessor import Preprocessor
 
 
@@ -262,28 +263,29 @@ def parse_chrome_manifest(path, base_pat
     for entry in parse_manifest(None, path):
         if isinstance(entry, Manifest):
             parse_chrome_manifest(
                 os.path.join(os.path.dirname(path), entry.relpath),
                 base_path,
                 chrome_entries
             )
         elif isinstance(entry, ManifestLocale):
+            entry_path = os.path.join(
+                os.path.relpath(
+                    os.path.dirname(path),
+                    base_path
+                ),
+                entry.relpath
+            )
             chrome_entries.append({
                 'type': 'locale',
                 'alias': entry.name,
                 'locale': entry.id,
                 'platforms': convert_entry_flags_to_platform_codes(entry.flags),
-                'path': os.path.join(
-                    os.path.relpath(
-                        os.path.dirname(path),
-                        base_path
-                    ),
-                    entry.relpath
-                )
+                'path': mozpath.normsep(entry_path)
             })
         else:
             raise Exception('Unknown type {0}'.format(entry.name))
 
 
 ###
 # Generates a new web manifest dict with values specific for a language pack.
 #