Slightly rework locking with pull_project

cpp/ci_logic.cpp

@@ -646,48 +646,56 @@ std::string CiLogic::queue_pull_tarball(std::vector<std::shared_ptr<PackageConf>
 
     try {
         for (auto &r : repos) {
-            std::lock_guard<std::mutex> lock(task_assignment_mutex);
-            auto found_it = encountered_items.find(r->package->name);
-            if (found_it != encountered_items.end()) {
-                // GHOST pull
-                auto existing_item = found_it->second;
-
-                // Assign tasks (reuse the same Task objects for "pull"/"tarball")
-                r->assign_task(job_statuses->at("pull"), existing_item->first_pull_task, r);
-                r->assign_task(job_statuses->at("tarball"), existing_item->first_tarball_task, r);
-
-                // Point packaging_commit/upstream_commit to the real pkgconf's pointers
-                r->packaging_commit = existing_item->first_pkgconf->packaging_commit;
-                r->upstream_commit  = existing_item->first_pkgconf->upstream_commit;
-                r->sync();
+            {
+                std::lock_guard<std::mutex> lock(task_assignment_mutex);
+                auto found_it = encountered_items.find(r->package->name);
+                if (found_it != encountered_items.end()) {
+                    // GHOST pull
+                    auto existing_item = found_it->second;
+
+                    // Assign tasks (reuse the same Task objects for "pull"/"tarball")
+                    r->assign_task(job_statuses->at("pull"), existing_item->first_pull_task, r);
+                    r->assign_task(job_statuses->at("tarball"), existing_item->first_tarball_task, r);
+
+                    // Point packaging_commit/upstream_commit to the real pkgconf's pointers
+                    r->packaging_commit = existing_item->first_pkgconf->packaging_commit;
+                    r->upstream_commit  = existing_item->first_pkgconf->upstream_commit;
+                    r->sync();
+                    continue;
+                }
             }
-            else {
-                // REAL pull
-                auto new_item = std::make_shared<package_conf_item>();
-                new_item->first_pkgconf = r;
-
-                // Enqueue "pull"
-                task_queue->enqueue(
-                    job_statuses->at("pull"),
-                    [this, r](std::shared_ptr<Log> log) mutable {
-                        pull_project(r, log);
-                        r->sync();
-                    },
-                    r
-                );
+            // REAL pull
+            auto new_item = std::make_shared<package_conf_item>();
+            new_item->first_pkgconf = r;
+
+            // Enqueue "pull"
+            task_queue->enqueue(
+                job_statuses->at("pull"),
+                [this, r](std::shared_ptr<Log> log) mutable {
+                    pull_project(r, log);
+                    r->sync();
+                },
+                r
+            );
+
+            {
+                std::lock_guard<std::mutex> lock(task_assignment_mutex);
                 new_item->first_pull_task = r->get_task_by_jobstatus(job_statuses->at("pull"));
+            }
 
-                // Enqueue "tarball"
-                task_queue->enqueue(
-                    job_statuses->at("tarball"),
-                    [this, r](std::shared_ptr<Log> log) mutable {
-                        create_project_tarball(r, log);
-                        r->sync();
-                    },
-                    r
-                );
-                new_item->first_tarball_task = r->get_task_by_jobstatus(job_statuses->at("tarball"));
+            // Enqueue "tarball"
+            task_queue->enqueue(
+                job_statuses->at("tarball"),
+                [this, r](std::shared_ptr<Log> log) mutable {
+                    create_project_tarball(r, log);
+                    r->sync();
+                },
+                r
+            );
 
+            {
+                std::lock_guard<std::mutex> lock(task_assignment_mutex);
+                new_item->first_tarball_task = r->get_task_by_jobstatus(job_statuses->at("tarball"));
                 encountered_items[r->package->name] = new_item;
             }
         }