[Title] add --noreverse to build-cli register

[Type] Feature
[Module] Toolchain /
[Priority] Minor
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I5aa7dfbd8e95249b6fc031b62a3b5b3570edc386

diff --git a/build-cli b/build-cli
index 5985bcb3dcce874cb33232fb932a9159119f8fbf..fb9758e2be8d7efbad2e182a6795bd82ec67a559 100755 (executable)
--- a/build-cli
+++ b/build-cli
@@ -319,7 +319,7 @@ begin
                        puts "Can't access server #{bs_ip}:#{bs_port}"
                        exit(-1)
                end
-               client.send("REGISTER|BINARY|#{File.basename(option[:package])}|#{option[:passwd]}|#{dock}|#{option[:dist]}|#{option[:user]}")
+               client.send("REGISTER|BINARY|#{File.basename(option[:package])}|#{option[:passwd]}|#{dock}|#{option[:dist]}|#{option[:user]}|#{option[:noreverse]}")
                if not client.print_stream then
                        puts "ERROR: #{client.get_error_msg()}"
                end

diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index 2e7e248c9e36debd02576360849fa0137de05c2b..b745a3c82e0d51ac568e0195919f286bb83462fe 100644 (file)
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -45,6 +45,7 @@ class RegisterPackageJob < CommonJob
        attr_accessor :source_path
        attr_accessor :pkgsvr_client, :thread, :pkg_type
        attr_accessor :pkg_name, :pkginfo, :cancel_state
+       attr_accessor :no_reverse
 
 
        # initialize
@@ -52,6 +53,7 @@ class RegisterPackageJob < CommonJob
                super(server)
                @log = nil
                @type = "REGISTER"
+               @no_reverse = false
 
                @host_os = Utils::HOST_OS
                if not project.nil? then
@@ -115,6 +117,11 @@ class RegisterPackageJob < CommonJob
        end
 
 
+       def set_no_reverse()
+               @no_reverse = true
+       end
+
+
        #
        def init
                # mkdir
@@ -407,10 +414,12 @@ class RegisterPackageJob < CommonJob
                                FileUtils.cp(@file_path,"#{@source_path}/#{newfile}")
 
                                # reverse check
-                               if not ReverseBuildChecker.check( self, true, os ) then
-                                       @status = "ERROR"
-                                       @log.error( "Reverse-build-check failed!" )
-                                       return
+                               if not @no_reverse then
+                                       if not ReverseBuildChecker.check( self, true, os ) then
+                                               @status = "ERROR"
+                                               @log.error( "Reverse-build-check failed!" )
+                                               return
+                                       end
                                end
                        end
                end

diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb
index b491ecb69d01c536dc6041f1372081706a39e149..7f864f35d9e7c782f1424404ee47065c9bd22623 100644 (file)
--- a/src/build_server/SocketJobRequestListener.rb
+++ b/src/build_server/SocketJobRequestListener.rb
@@ -779,7 +779,7 @@ class SocketJobRequestListener
                        # add
                        @parent_server.jobmgr.add_job( new_job )
 
-                       # REGISTER|BINARY|filename|passwd|dock|dist_name|user_email
+                       # REGISTER|BINARY|filename|passwd|dock|dist_name|user_email|no_reverse
                when "BINARY"
                        # parse
                        filename = tok[2]
@@ -787,6 +787,7 @@ class SocketJobRequestListener
                        dock = (tok[4].nil? or tok[4].empty?) ? "0" : tok[4].strip
                        dist_name = tok[5]
                        user_email = tok[6].strip
+                       no_reverse = tok[7].eql? "YES"
 
                        if (dist_name.nil? or dist_name.empty?) then
                                dist_name = @parent_server.distmgr.get_default_distribution_name()
@@ -834,6 +835,9 @@ class SocketJobRequestListener
 
                        new_job.user_id = user_id
 
+                       # check reverse build
+                       if no_reverse then new_job.set_no_reverse end
+
                        # create logger and set
                        logger = JobLog.new( new_job, req )
                        new_job.set_logger(logger)