diff -r a9cd24eaa361 -r 7fa561e5d7c7 mozilla-bmo1568145.patch --- a/mozilla-bmo1568145.patch Sat Mar 07 09:48:10 2020 +0100 +++ b/mozilla-bmo1568145.patch Mon Mar 30 21:49:01 2020 +0200 @@ -8,10 +8,14 @@ for the definition of this variable. diff --git a/python/mozbuild/mozbuild/action/langpack_manifest.py b/python/mozbuild/mozbuild/action/langpack_manifest.py -index 6f72697..d4cca96 100644 --- a/python/mozbuild/mozbuild/action/langpack_manifest.py +++ b/python/mozbuild/mozbuild/action/langpack_manifest.py -@@ -16,6 +16,7 @@ import os +@@ -11,16 +11,17 @@ + from __future__ import absolute_import, print_function + + import argparse + import sys + import os import json import io import datetime @@ -19,7 +23,17 @@ import requests import mozversioncontrol import mozpack.path as mozpath -@@ -100,7 +101,7 @@ def get_timestamp_for_locale(path): + from mozpack.chrome.manifest import ( + Manifest, + ManifestLocale, + parse_manifest, + ) +@@ -94,17 +95,17 @@ def get_dt_from_hg(path): + # ts == "20170914215617" + ### + def get_timestamp_for_locale(path): + dt = None + if os.path.isdir(os.path.join(path, '.hg')): dt = get_dt_from_hg(path) if dt is None: @@ -28,3 +42,8 @@ dt = dt.replace(microsecond=0) return dt.strftime("%Y%m%d%H%M%S") + + + ### + # Parses multiple defines files into a single key-value pair object. + #