Bug 1381577 - Part S; Support Taskcluster win l10n repacks in mozharness scripts. r=aki

Land date changes to support windows nightlies onto central

MozReview-Commit-ID: 4Nxhbutjhfu

--HG--
extra : rebase_source : 2a180738584d6de77fe1b8fe81ecb004582000c5
This commit is contained in:
Justin Wood 2017-07-18 14:06:19 -04:00
Родитель c93d0cefa5
Коммит 77d574d8d2
1 изменённых файлов: 9 добавлений и 2 удалений

Просмотреть файл

@ -272,6 +272,8 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
self.read_buildbot_config()
if not self.buildbot_config:
self.warning("Skipping buildbot properties overrides")
# Set an empty dict
self.buildbot_config = {"properties": {}}
return
props = self.buildbot_config["properties"]
for prop in ['mar_tools_url']:
@ -809,10 +811,15 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
glob_name = "*.%s.*" % locale
matches = (glob.glob(os.path.join(upload_target, glob_name)) +
glob.glob(os.path.join(upload_target, 'update', glob_name)) +
glob.glob(os.path.join(upload_target, '*', 'xpi', glob_name)))
glob.glob(os.path.join(upload_target, '*', 'xpi', glob_name)) +
glob.glob(os.path.join(upload_target, 'install', 'sea', glob_name)) +
glob.glob(os.path.join(upload_target, 'setup.exe')) +
glob.glob(os.path.join(upload_target, 'setup-stub.exe')))
targets_exts = ["tar.bz2", "dmg", "langpack.xpi",
"complete.mar", "checksums"]
"complete.mar", "checksums", "zip",
"installer.exe", "installer-stub.exe"]
targets = ["target.%s" % ext for ext in targets_exts]
targets.extend(['setup.exe', 'setup-stub.exe'])
for f in matches:
target_file = next(target_file for target_file in targets
if f.endswith(target_file[6:]))