From: Sungmin kim <dev.sungmin.kim@samsung.com>
Date: Wed, 3 Apr 2013 02:38:14 +0000 (+0900)
Subject: [title] Fixed Multi-job about sub-job add internal job for cancel process
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbee68c3af3da19a6cb499dbdf39ccea0e817ef6;p=sdk%2Ftools%2Fsdk-build.git

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

diff --git a/build-cli b/build-cli
index ecbfc9c..afd11ac 100755
--- 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 3aad1cc..7aff6ec 100644
--- 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