External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #400 from ansible/taskman_dep_update_improve

Browse Source 
Fix an issue where dependent updates weren't sorted correctly
This commit is contained in:
Matthew Jones
2017-09-13 06:17:56 -07:00
committed by GitHub
parent 66d78bca8a 9f3a0c0716
commit 10a3959f52
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/scheduler/__init__.py
View File

@@ -300,7 +300,7 @@ class TaskManager():
# Already processed dependencies for this job # Already processed dependencies for this job
if job.dependent_jobs.all(): if job.dependent_jobs.all():
return False return False
latest_inventory_update = InventoryUpdate.objects.filter(inventory_source=inventory_source).order_by("created") latest_inventory_update = InventoryUpdate.objects.filter(inventory_source=inventory_source).order_by("-created")
if not latest_inventory_update.exists(): if not latest_inventory_update.exists():
return True return True
latest_inventory_update = latest_inventory_update.first() latest_inventory_update = latest_inventory_update.first()
@@ -323,7 +323,7 @@ class TaskManager():
now = tz_now() now = tz_now()
if job.dependent_jobs.all(): if job.dependent_jobs.all():
return False return False
latest_project_update = ProjectUpdate.objects.filter(project=job.project).order_by("created") latest_project_update = ProjectUpdate.objects.filter(project=job.project, job_type='check').order_by("-created")
if not latest_project_update.exists(): if not latest_project_update.exists():
return True return True
latest_project_update = latest_project_update.first() latest_project_update = latest_project_update.first()