[Title] apply nitpick to src/build_sever 1

[Type] Enhancement
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I77b0e6c04ebcd6d2126b941b484f70f3cb1955e0

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index 05523b7aeb575a873ea0f4adf66f29c0b845c1fe..3690cb559cd5d4c1549897a6af9ff1ad9fc07714 100644 (file)
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -134,9 +134,6 @@ class BuildServer
                # init job mgr
                @log.info "Intializing Job Manager..."
                @jobmgr.init()
-       
-               pkgsvr_id = @id
-               pkgsvr_dist = @pkgserver_url.split("/")[-1]
 
                # set job request listener
                @log.info "Setting listener..."
@@ -236,11 +233,11 @@ class BuildServer
        
                # if already exit, return false
                for entry in @remote_pkg_servers
-                       u = entry[0]; p = entry[1]
+                       u = entry[0]
 
                        if u == url then
                                return false
-                       end     
+                       end
                end
 
                @remote_pkg_servers.push [url, proxy]

diff --git a/src/build_server/CommonProject.rb b/src/build_server/CommonProject.rb
index 0c539e3ea2b88e74efc4cb5b1169d694e0db6203..10caaafb0e50b2610abd3b495da3579493e64880 100644 (file)
--- a/src/build_server/CommonProject.rb
+++ b/src/build_server/CommonProject.rb
@@ -47,15 +47,14 @@ class CommonProject
 
        #return passwd
        def is_passwd_set?()
-               return @passwd.empty? ? false:true
+               return ( not @passwd.empty? )
        end
 
 
        def passwd_match?(word)
                if not is_passwd_set? then return true end
 
-               if word.nil? then return false end
-               if word.eql? @passwd then 
+               if word.eql? @passwd then
                        return true
                else
                        return false

diff --git a/src/build_server/FullBuildJob.rb b/src/build_server/FullBuildJob.rb
index bc603b0c6f9a44c26d7ed8ace4641fdda6ccaf87..1aebaed84901d314ffcf9353e6465e057931f068 100644 (file)
--- a/src/build_server/FullBuildJob.rb
+++ b/src/build_server/FullBuildJob.rb
@@ -148,7 +148,7 @@ class FullBuildJob
 
 
        def has_same_packages?( wjob )
-               return self == wjob ? true : false
+               return self.eql? wjob
        end
 
 

diff --git a/src/build_server/GitBuildJob.rb b/src/build_server/GitBuildJob.rb
index 36d05c1be831f34861210622efed3b5c3166a354..471662a95b460109dd60340f21a7b74a4e68595b 100644 (file)
--- a/src/build_server/GitBuildJob.rb
+++ b/src/build_server/GitBuildJob.rb
@@ -77,7 +77,6 @@ class GitBuildJob < BuildJob
                if ( @server.send_mail.eql? "YES" ) and ( not @pkginfo.nil? ) and ( not @pkginfo.packages.nil? ) then 
                        mail_list = []
                        contents = []
-                       done_pkg_list = []
                        contents.push " "
                        contents.push " Git information : #{@git_commit} "
                        contents.push " "

diff --git a/src/build_server/JobClean.rb b/src/build_server/JobClean.rb
index 9964a15fc98617875be7eed6af16fbeda5203144..d58de7d7d07385a228c346b831a51ff596f88d90 100644 (file)
--- a/src/build_server/JobClean.rb
+++ b/src/build_server/JobClean.rb
@@ -161,7 +161,6 @@ class JobCleaner
        
        # clean after some time
        def clean_afterwards(job_id)
-               curr = Time.now
                time = Time.now + @server.keep_time
                job_path = "#{@server.path}/jobs/#{job_id}"
                @handler.register(JobCleanAction.new(time, job_path, @list_file, @server))

diff --git a/src/build_server/JobManager.rb b/src/build_server/JobManager.rb
index d2b55dfdaf9cbdac46cfb50ca05d963963d7c7eb..9647f021822aa07edd8c3ae08e891235ace7504b 100644 (file)
--- a/src/build_server/JobManager.rb
+++ b/src/build_server/JobManager.rb
@@ -344,11 +344,10 @@ class JobManager
 
        # check there are working jobs
        def has_working_jobs
-               working_cnt = 0
                for job in @jobs + @internal_jobs + @reverse_build_jobs
                        if job.status == "WORKING" then
                                return true
-                       end     
+                       end
                end
 
                return false
@@ -357,11 +356,10 @@ class JobManager
 
        # check there are waiting jobs
        def has_waiting_jobs
-               waiting_cnt = 0
                for job in @jobs + @internal_jobs + @reverse_build_jobs
                        if job.status == "WAITING" then
                                return true
-                       end     
+                       end
                end
 
                return false

diff --git a/src/build_server/LocalBuildJob.rb b/src/build_server/LocalBuildJob.rb
index 7df78e091a510856b3c531e165eaef6acafa96bb..0eb187877ee183af3b8f259687334fd3ef40d645 100644 (file)
--- a/src/build_server/LocalBuildJob.rb
+++ b/src/build_server/LocalBuildJob.rb
@@ -35,7 +35,7 @@ class LocalBuildJob < BuildJob
        attr_accessor :id, :status, :pkginfo, :pkgsvr_client, :thread, :log, :rev_fail_list, :rev_success_list, :source_path
 
        # initialize
-       def initialize (local_path, os, pkgserver_url, options, server, parent, outstream, resolve )
+       def initialize (local_path, os, pkgsvr_url, options, server, parent, outstream, resolve )
                super(server.jobmgr.get_new_job_id(), server)
         @rev_fail_list = []
         @rev_success_list = []
@@ -87,7 +87,6 @@ class LocalBuildJob < BuildJob
                if ( @server.send_mail.eql? "YES" ) and ( not @pkginfo.nil? ) and ( not @pkginfo.packages.nil? ) then 
                        mail_list = []
                        contents = []
-                       done_pkg_list = []
                        contents.push " "
                        contents.push "%-30s| %10s | %10s" % ["package name", "version", "os"]
                        contents.push "---------------------------------------------------------------"

diff --git a/src/build_server/MultiBuildJob.rb b/src/build_server/MultiBuildJob.rb
index 09f9ea6d3bb9ad1688b6f6d33a1240f1178b54cb..b41bfc7096f277fc5251077becf21df5e759ffb6 100644 (file)
--- a/src/build_server/MultiBuildJob.rb
+++ b/src/build_server/MultiBuildJob.rb
@@ -435,7 +435,6 @@ class MultiBuildJob
        
                # get package path list
                binpkg_path_list = Dir.glob("#{@source_path}/*_*_*.zip")
-               srcpkg_path_list = Dir.glob("#{@source_path}/*.tar.gz")
 
                # upload
                u_client = Client.new( @server.pkgserver_url, nil, @log )

diff --git a/src/build_server/ProjectManager.rb b/src/build_server/ProjectManager.rb
index 479c17364ab4978e3ba2fd34dfacd7a0f3779ac6..b69b4bc51215b4331290c94d988d070f25b9383d 100644 (file)
--- a/src/build_server/ProjectManager.rb
+++ b/src/build_server/ProjectManager.rb
@@ -154,7 +154,6 @@ class ProjectManager
                result = MultiBuildJob.new( @server )
 
                # create sub jobs
-               build_jobs = []
                for prj in @projects
                        if prj.type != "GIT" then next end