Skip to content

Commit

Permalink
Bug 1881272: ignore rare, recoverable error condition during l10n rep…
Browse files Browse the repository at this point in the history
…ack r=eemeli

Differential Revision: https://phabricator.services.mozilla.com/D211985
  • Loading branch information
bhearsum committed Jun 4, 2024
1 parent 43a2135 commit 6d9886b
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion python/mozbuild/mozbuild/action/langpack_manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import mozversioncontrol
import requests
from fluent.syntax.parser import FluentParser
from hglib.error import ServerError
from mozpack.chrome.manifest import Manifest, ManifestLocale, parse_manifest
from redo import retry

Expand Down Expand Up @@ -118,7 +119,16 @@ def get_pushlog():
def get_timestamp_for_locale(path):
dt = None
if os.path.isdir(os.path.join(path, ".hg")):
dt = get_dt_from_hg(path)
dt = None
# This can be removed once we're no longer repacking from hg l10n repos.
try:
dt = get_dt_from_hg(path)
except ServerError as se:
# This rare condition can happen if we try to repack from a
# git l10n repository after having already repacked from an
# hg l10n repository on the same machine.
if "sharedpath points to nonexistent directory" not in str(se):
raise se

if dt is None:
dt = get_build_date()
Expand Down

0 comments on commit 6d9886b

Please sign in to comment.