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

diff --git a/package/changelog b/package/changelog
index f5d297cc0a1d1e4bd26bff3a56030a5f4c6c27ca..597beffe622ade9a8a990bcf5876009759c2a949 100644 (file)
--- 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 0476ae797703ccaee8ed6a9330595c331df84ad8..fb8055d89bc4a14990be42f9ec7831c214937150 100644 (file)
--- 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 8c98f0808430f46fb8e654993d89e955ba2967bc..03d2548f6dc5a43113184b019bf3f5222348664d 100644 (file)
--- 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 f0ce6108f640df6154982a5a40fa0eefa90dad12..c4c6e24eabd1dbc6d7b6e32e557ec2ce5f6e8855 100644 (file)
--- 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