[Title] Added more "CANCEL" check points

diff --git a/package/changelog b/package/changelog
index 9199c29b1528b37d1934d71d52beb3a59b2af51c..f5d297cc0a1d1e4bd26bff3a56030a5f4c6c27ca 100644 (file)
--- 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 427ee39435608db1255ebaedad2d9f82e8340f0b..0476ae797703ccaee8ed6a9330595c331df84ad8 100644 (file)
--- 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 eeb6a645f43f6470761c5f62696287404d094c4b..f0ce6108f640df6154982a5a40fa0eefa90dad12 100644 (file)
--- 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 3ef38d10642f51cd775a726758cfa7f30efc1581..4797c29acdbb5d2b8668b7a3cb26417cdfc9a993 100644 (file)
--- 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 b3c63853cfac3602b97d0202af323fc3f8bb6e9a..ec4459c0ab06b326edcf66e019f1dc96e4f589f2 100644 (file)
--- 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