Bug 1900059: Get rid of references to 'six' in gittool.py to fix multil10n.py usage of gittool.py r=releng-reviewers,jcristau,hneiva

The `multil10n.py` mozharness script that gets run as part of `fx_desktop_build.py` (which we use to make android builds...) ends up in a virtualenv without this installed. It's no longer needed anyways as Python 2 is long gone, so dropping the references to `six` is the best fix.

Differential Revision: https://phabricator.services.mozilla.com/D212390
This commit is contained in:
Ben Hearsum 2024-06-04 00:25:08 +00:00
parent f849fea93b
commit 03f16f7693

View File

@ -10,11 +10,11 @@ module_sources = [
),
(
"util.file",
"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",
),
(
"util.commands",
"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",
),
(
"util.retry",