thuderbird: prepare icedove release v128
This commit is contained in:
parent
42344a8d22
commit
2d72e52681
7 changed files with 1275 additions and 102 deletions
|
|
@ -132,7 +132,7 @@ class Changes(RemoteSettings):
|
|||
changes = []
|
||||
|
||||
for collection in unwrapped_jsons:
|
||||
if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json':
|
||||
if collection.path not in (RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json', RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/search-config-v2.json'):
|
||||
latest_change = {}
|
||||
latest_change[cls._LAST_MODIFIED_KEY_NAME] = cls.get_collection_timestamp(
|
||||
collection)
|
||||
|
|
@ -147,11 +147,12 @@ class Changes(RemoteSettings):
|
|||
|
||||
class SearchConfig(RemoteSettings):
|
||||
JSON_PATHS = (
|
||||
RemoteSettings.DUMPS_PATH_ABSOLUTE /
|
||||
'main/search-config.json',
|
||||
# RemoteSettings.DUMPS_PATH_ABSOLUTE /
|
||||
# 'main/search-config.json',
|
||||
pathlib.Path('comm/mail/app/settings/dumps/icedove/search-config.json'),
|
||||
)
|
||||
SCHEMA_PATH = arguments.MAIN_PATH / \
|
||||
'toolkit/components/search/schema/search-engine-config-schema.json'
|
||||
'toolkit/components/search/schema/search-config-schema.json'
|
||||
OUTPUT_PATH = JSON_PATHS[0]
|
||||
|
||||
_DUCKDUCKGO_SEARCH_ENGINE_ID = 'ddg@search.mozilla.org'
|
||||
|
|
@ -159,7 +160,9 @@ class SearchConfig(RemoteSettings):
|
|||
@classmethod
|
||||
def should_drop_record(cls, search_engine):
|
||||
return search_engine['webExtension']['id'] not in (
|
||||
cls._DUCKDUCKGO_SEARCH_ENGINE_ID, 'wikipedia@search.mozilla.org')
|
||||
cls._DUCKDUCKGO_SEARCH_ENGINE_ID, 'wikipedia@search.mozilla.org',
|
||||
'trisquel@search.mozilla.org', 'trisquel-packages@@search.mozilla.org',
|
||||
'qwant@search.mozilla.org', 'ecosia@search.mozilla.org')
|
||||
|
||||
@classmethod
|
||||
def process_record(cls, search_engine):
|
||||
|
|
@ -176,6 +179,8 @@ class SearchConfig(RemoteSettings):
|
|||
|
||||
if 'included' in specifier and 'everywhere' in specifier[
|
||||
'included'] and specifier['included']['everywhere']:
|
||||
if search_engine['webExtension']['id'] == cls._DUCKDUCKGO_SEARCH_ENGINE_ID:
|
||||
specifier['default'] = 'yes'
|
||||
general_specifier = specifier
|
||||
|
||||
if not general_specifier:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue