[title] Fixed Multi-job about sub-job add internal job for cancel process

diff --git a/build-cli b/build-cli
index ecbfc9c53e321d2b9c302c8fa6b50f3c55fc3f4c..afd11ac04323921b22c5962ba473ebd7e7ee5193 100755 (executable)
--- a/build-cli
+++ b/build-cli
@@ -286,7 +286,6 @@ begin
 
                                if line.eql? "=LOG_ERROR" then
                                        result = false
-                                       break
                                end
 
                                log.puts line

diff --git a/src/build_server/MultiBuildJob.rb b/src/build_server/MultiBuildJob.rb
index 3aad1cc7edfb26edc9130569372b180ac53d408a..7aff6ec191e4c4044171ffc93851a4e8b0050ef3 100644 (file)
--- a/src/build_server/MultiBuildJob.rb
+++ b/src/build_server/MultiBuildJob.rb
@@ -117,13 +117,11 @@ class MultiBuildJob < CommonJob
                        if not job.init or job.status == "ERROR" then
                                job.status = "ERROR"
                                @log.info( "Failed to initialize sub-job \"#{job.get_project().name}\" for #{job.os}. (#{job.id})", Log::LV_USER)
-                               job.terminate()
                        end
 
                        if job.status != "ERROR" then
                                job.status = "WAITING"
                        else
-                               job.status = "ERROR"
                                tstatus = "ERROR"
                        end
                end
@@ -131,8 +129,11 @@ class MultiBuildJob < CommonJob
                        # Changed the status of initialized sub-jobs if parent is in ERROR status
                        @sub_jobs.each do |job|
                                if job.status == "WAITING" then
+                                       job.event = "CANCEL"
                                        job.status = "CANCELED"
                                end 
+                               # Add internal job for cancel,error process
+                               @server.jobmgr.add_internal_job(job)
                        end
                        @status = tstatus
                        return false