From: donghee yang <donghee.yang@samsung.com>
Date: Tue, 26 Mar 2013 09:58:56 +0000 (+0900)
Subject: [Title] Fixed a bug that canceling remote job is not finished
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c82082854eb363e69d790a6be9be1093d8b8ca10;p=sdk%2Ftools%2Fsdk-build.git

[Title] Fixed a bug that canceling remote job is not finished
---

diff --git a/package/changelog b/package/changelog
index f5d297c..597beff 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.11
+- Fixed a bug that "CANCEL" of remote job is not finished
+== donghee yang <donghee.yang@samsung.com> 2013-03-26
 * 2.1.10
 - Added more check points for immediate "CANCEL" 
 == donghee yang <donghee.yang@samsung.com> 2013-03-26
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 0476ae7..fb8055d 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :2.1.10
+Version :2.1.11
 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/BuildServerException.rb b/src/build_server/BuildServerException.rb
index 8c98f08..03d2548 100644
--- a/src/build_server/BuildServerException.rb
+++ b/src/build_server/BuildServerException.rb
@@ -1,4 +1,6 @@
 class BuildServerException < Exception
+	attr_accessor :err_code
+
 	@@err_msgs = {
 		"ERR001" => "Invalid request format is used!",
 		"ERR002" => "Distribution not found!",
diff --git a/src/build_server/CommonJob.rb b/src/build_server/CommonJob.rb
index f0ce610..c4c6e24 100644
--- a/src/build_server/CommonJob.rb
+++ b/src/build_server/CommonJob.rb
@@ -146,7 +146,8 @@ class CommonJob
 				if not is_sub_job? then terminate() end
 			rescue BuildServerException => e
 				@log.error e.message
-				if @status == "WORKING" then @status = "ERROR" end
+				# "CANCEL" operation(ERR900) must be excluded
+				if @status == "WORKING" and e.err_code != "ERR900"  then @status = "ERROR" end
 			rescue => e
 				@log.error e.message
 				@log.error e.backtrace.inspect