Skip to content

Commit 02420a5

Browse files
style: pre-commit.ci auto fixes [...]
1 parent cbd7019 commit 02420a5

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

signingscript/src/signingscript/sign.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@
8585
"autograph_stage_mar384": {"dep-signing": "autograph_stage.pem"},
8686
"autograph_hash_only_mar384": {"release-signing": "release_primary.pem", "nightly-signing": "nightly_aurora_level3_primary.pem", "dep-signing": "dep1.pem"},
8787
"stage_autograph_stage_mar384": {"dep-signing": "autograph_stage.pem"},
88-
"stage_autograph_hash_only_mar384": {"release-signing": "release_primary.pem", "nightly-signing": "nightly_aurora_level3_primary.pem", "dep-signing": "dep1.pem"},
88+
"stage_autograph_hash_only_mar384": {
89+
"release-signing": "release_primary.pem",
90+
"nightly-signing": "nightly_aurora_level3_primary.pem",
91+
"dep-signing": "dep1.pem",
92+
},
8993
}
9094

9195
# Langpacks expect the following re to match for addon id

signingscript/src/signingscript/task.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,18 @@ def _sort_formats(formats):
193193
"""
194194
# Widevine formats must be after other formats other than macapp; GPG must
195195
# be last.
196-
for fmt in ("widevine", "autograph_widevine", "stage_autograph_widevine", "autograph_omnija", "stage_autograph_omnija", "macapp", "autograph_rsa", "stage_autograph_rsa", "autograph_gpg", "stage_autograph_gpg"):
196+
for fmt in (
197+
"widevine",
198+
"autograph_widevine",
199+
"stage_autograph_widevine",
200+
"autograph_omnija",
201+
"stage_autograph_omnija",
202+
"macapp",
203+
"autograph_rsa",
204+
"stage_autograph_rsa",
205+
"autograph_gpg",
206+
"stage_autograph_gpg",
207+
):
197208
if fmt in formats:
198209
formats.remove(fmt)
199210
formats.append(fmt)

signingscript/src/signingscript/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,11 @@ def is_apk_autograph_signing_format(format_):
211211
212212
"""
213213
# TODO Remove autograph_focus once format is migrated
214-
return format_ and format_.startswith(("autograph_apk_", "stage_autograph_apk_")) or format_ in ("autograph_focus", "autograph_stage_aab", "autograph_aab", "stage_autograph_focus", "stage_autograph_aab")
214+
return (
215+
format_
216+
and format_.startswith(("autograph_apk_", "stage_autograph_apk_"))
217+
or format_ in ("autograph_focus", "autograph_stage_aab", "autograph_aab", "stage_autograph_focus", "stage_autograph_aab")
218+
)
215219

216220

217221
def is_sha1_apk_autograph_signing_format(format_):

0 commit comments

Comments
 (0)