From 88bcd9726349a6c9a6fd46fe97a896e91050d698 Mon Sep 17 00:00:00 2001 From: "jiil.hyoun" Date: Thu, 23 Aug 2012 18:18:18 +0900 Subject: [PATCH] [Title] apply nitpick to src/build_sever 1 [Type] Enhancement [Module] Toolchain / [Priority] Major [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Change-Id: I77b0e6c04ebcd6d2126b941b484f70f3cb1955e0 --- src/build_server/BuildServer.rb | 7 ++----- src/build_server/CommonProject.rb | 5 ++--- src/build_server/FullBuildJob.rb | 2 +- src/build_server/GitBuildJob.rb | 1 - src/build_server/JobClean.rb | 1 - src/build_server/JobManager.rb | 6 ++---- src/build_server/LocalBuildJob.rb | 3 +-- src/build_server/MultiBuildJob.rb | 1 - src/build_server/ProjectManager.rb | 1 - 9 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb index 05523b7..3690cb5 100644 --- 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 0c539e3..10caaaf 100644 --- 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 bc603b0..1aebaed 100644 --- 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 36d05c1..471662a 100644 --- 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 9964a15..d58de7d 100644 --- 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 d2b55df..9647f02 100644 --- 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 7df78e0..0eb1878 100644 --- 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 09f9ea6..b41bfc7 100644 --- 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 479c173..b69b4bc 100644 --- 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 -- 2.34.1