bug 1398799: don't add depedencies when current task and upstream task don't have a matching build platform. r=aki

This commit is contained in:
Ben Hearsum 2018-02-07 14:50:10 -05:00
Родитель 85569e86c1
Коммит 3403f15207
1 изменённых файлов: 5 добавлений и 0 удалений

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

@ -59,6 +59,11 @@ def add_dependencies(config, jobs):
dep_phase = dep_task.attributes.get('shipping_phase') dep_phase = dep_task.attributes.get('shipping_phase')
if dep_phase and PHASES.index(dep_phase) > PHASES.index(phase): if dep_phase and PHASES.index(dep_phase) > PHASES.index(phase):
continue continue
if dep_task.attributes.get("build_platform") and \
job.get("attributes", {}).get("build_platform"):
if dep_task.attributes["build_platform"] != job["attributes"]["build_platform"]:
continue
# Add matching product tasks to deps # Add matching product tasks to deps
if _get_product(dep_task.task) == product or \ if _get_product(dep_task.task) == product or \
dep_task.attributes.get('shipping_product') == product: dep_task.attributes.get('shipping_product') == product: