In catkin build, preserve original job list topological ordering when (…

…#626) moving jobs from pending to queued
catkin · Feb 5, 2021 · ba8ec0e · ba8ec0e
1 parent e1d471a
commit ba8ec0e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/catkin_tools/execution/executor.py b/catkin_tools/execution/executor.py
@@ -342,7 +342,10 @@ async def execute_jobs(
             new_queued_jobs, pending_jobs = split(
                 pending_jobs,
                 lambda j: j.all_deps_completed(completed_jobs))
-            queued_jobs.extend(new_queued_jobs)
+            new_queued_jobs.extend(queued_jobs)
+
+            # queued jobs should preserve the original topological sort of jobs
+            queued_jobs = [j for j in jobs if j in new_queued_jobs]
 
             # Notify of newly queued jobs
             for queued_job in new_queued_jobs: