From 6ff4329e71227f26fb1fd69335fe973a1b17a6cf Mon Sep 17 00:00:00 2001
From: donghee yang <donghee.yang@samsung.com>
Date: Tue, 26 Mar 2013 18:18:51 +0900
Subject: [PATCH] [Title] Added more "CANCEL" check points

---
 package/changelog                      | 3 +++
 package/pkginfo.manifest               | 2 +-
 src/build_server/CommonJob.rb          | 5 +++++
 src/build_server/RegisterPackageJob.rb | 3 +++
 src/builder/Builder.rb                 | 3 +++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package/changelog b/package/changelog
index 9199c29..f5d297c 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.10
+- Added more check points for immediate "CANCEL" 
+== donghee yang <donghee.yang@samsung.com> 2013-03-26
 * 2.1.9
 - Fixed a bug that "CANCEL" is not done immediately
 == donghee yang <donghee.yang@samsung.com> 2013-03-26
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 427ee39..0476ae7 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :2.1.9
+Version :2.1.10
 Maintainer : taejun ha<taejun.ha@samsung.com>, jiil hyoun <jiil.hyoun@samsung.com>, donghyuk yang <donghyouk.yang@samsung.com>, donghee yang <donghee.yang@samsung.com>, sungmin kim <dev.sungmin.kim@samsung.com
 
 Package : dibs
diff --git a/src/build_server/CommonJob.rb b/src/build_server/CommonJob.rb
index eeb6a64..f0ce610 100644
--- a/src/build_server/CommonJob.rb
+++ b/src/build_server/CommonJob.rb
@@ -198,6 +198,9 @@ class CommonJob
 	# create process to execute command
 	public
 	def execute_command(cmd)
+		# if canceled, must prevent invoking more process
+		check_event
+
 		# execute
 		pid, status = Utils.execute_shell_with_log(cmd, @log.path, false)
 		@sub_pid = pid
@@ -211,7 +214,9 @@ class CommonJob
 		end
 		@sub_pid = 0
 
+		# if canceled, must exit job thread
 		check_event
+
 		# return
 		return pid, status
 	end
diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index 3ef38d1..4797c29 100644
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -119,7 +119,10 @@ class RegisterPackageJob < CommonJob
 	end
 
 	def execute_shell(cmd)
+		# if canceled, must prevent invoking more process
+		check_event
 		ret = Utils.execute_shell(cmd)
+		# if canceled, must exit job thread
 		check_event
 		return ret
 	end
diff --git a/src/builder/Builder.rb b/src/builder/Builder.rb
index b3c6385..ec4459c 100644
--- a/src/builder/Builder.rb
+++ b/src/builder/Builder.rb
@@ -244,6 +244,9 @@ class Builder
 		# install build dependencies
 		@log.info( "Installing dependent packages...", Log::LV_USER)
 		pkginfo.get_build_dependencies( os ).each do |dep|
+			# if job, check "CANCEL" 
+			if not @job.nil? then @job.check_event() end
+
 			if dep.target_os_list.count != 0 then
 				dep_target_os = dep.target_os_list[0]
 			else
-- 
2.34.1